Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
slapos
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Labels
Merge Requests
104
Merge Requests
104
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Jobs
Commits
Open sidebar
nexedi
slapos
Commits
ff836b4e
Commit
ff836b4e
authored
Nov 01, 2022
by
Jérome Perrin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
component/ca-certificates: use buildout's python
We want to avoid using system python
parent
b4df8a33
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
5 deletions
+4
-5
component/ca-certificates/buildout.cfg
component/ca-certificates/buildout.cfg
+2
-2
component/ca-certificates/ca-certificates-any-python.patch
component/ca-certificates/ca-certificates-any-python.patch
+2
-3
No files found.
component/ca-certificates/buildout.cfg
View file @
ff836b4e
...
@@ -16,10 +16,10 @@ url = http://deb.debian.org/debian/pool/main/c/ca-certificates/ca-certificates_2
...
@@ -16,10 +16,10 @@ url = http://deb.debian.org/debian/pool/main/c/ca-certificates/ca-certificates_2
md5sum = c02582bf9ae338e558617291897615eb
md5sum = c02582bf9ae338e558617291897615eb
patch-binary = ${patch:location}/bin/patch
patch-binary = ${patch:location}/bin/patch
patches =
patches =
${:_profile_base_location_}/ca-certificates-any-python.patch#4
7c2509f1346bd5af8123fb1a2751c2c
${:_profile_base_location_}/ca-certificates-any-python.patch#4
46a3f164c6b80ad7b63dd0f8662fec0
${:_profile_base_location_}/ca-certificates-sbin-dir.patch#0b4e7d82ce768823c01954ee41ef177b
${:_profile_base_location_}/ca-certificates-sbin-dir.patch#0b4e7d82ce768823c01954ee41ef177b
patch-options = -p0
patch-options = -p0
configure-command = true
configure-command = true
make-targets = install DESTDIR=@@LOCATION@@ CERTSDIR=certs SBINDIR=sbin
make-targets = install DESTDIR=@@LOCATION@@ CERTSDIR=certs SBINDIR=sbin
PYTHON=${buildout:executable}
environment =
environment =
PATH=${xz-utils:location}/bin:%(PATH)s
PATH=${xz-utils:location}/bin:%(PATH)s
component/ca-certificates/ca-certificates-any-python.patch
View file @
ff836b4e
...
@@ -11,13 +11,12 @@
...
@@ -11,13 +11,12 @@
if line.startswith('CKA_CLASS'):
if line.startswith('CKA_CLASS'):
--- mozilla/Makefile 2015-12-20 10:49:23.000000000 +0100
--- mozilla/Makefile 2015-12-20 10:49:23.000000000 +0100
+++ mozilla/Makefile 2016-01-05 20:19:11.006874271 +0100
+++ mozilla/Makefile 2016-01-05 20:19:11.006874271 +0100
@@ -3,7 +3,
8
@@
@@ -3,7 +3,
7
@@
#
#
all:
all:
- python3 certdata2pem.py
- python3 certdata2pem.py
+ for x in '' 2 3; do type python$$x && break; done >/dev/null \
+ $(PYTHON) certdata2pem.py
+ && python$$x certdata2pem.py
clean:
clean:
-rm -f *.crt
-rm -f *.crt
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment