summaryrefslogtreecommitdiff
path: root/cscript
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2022-02-10 18:39:17 +0100
committerCarl Hetherington <cth@carlh.net>2022-02-10 18:39:17 +0100
commitb6d1f45da2309f50bb12aef5ff63ab6955dbe1b9 (patch)
treec1d82a53b85dafec6593a4e8606934daa7b91f03 /cscript
parent47eb4bb86b59bd2e28dceac857397ae8df8ed1de (diff)
Revert inclusion of our own openssl.2174-no-shipped-openssl
Diffstat (limited to 'cscript')
-rw-r--r--cscript8
1 files changed, 0 insertions, 8 deletions
diff --git a/cscript b/cscript
index 390978de5..8f18ad7dc 100644
--- a/cscript
+++ b/cscript
@@ -341,7 +341,6 @@ def make_spec(filename, version, target, options, requires=None):
print('%{_bindir}/dcpomatic2_kdm_cli', file=f)
print('%{_bindir}/dcpomatic2_player', file=f)
print('%{_bindir}/dcpomatic2_playlist', file=f)
- print('%{_bindir}/dcpomatic2_openssl', file=f)
print('%{_bindir}/dcpomatic2_combiner', file=f)
print('%{_bindir}/dcpomatic2_verify', file=f)
if os.path.exists(os.path.join(tools, "dcpomatic2_disk")):
@@ -400,7 +399,6 @@ def make_spec(filename, version, target, options, requires=None):
print('%install', file=f)
print('cd dcpomatic-%s' % version, file=f)
print('./waf install', file=f)
- print('/bin/cp %s/src/openssl/apps/openssl %%{buildroot}/usr/bin/dcpomatic2_openssl' % target.directory, file=f)
print('/bin/mkdir -p %{buildroot}/usr/share/libdcp', file=f)
print('/bin/cp -r %s/src/libdcp/tags %%{buildroot}/usr/share/libdcp' % target.directory, file=f)
print('/bin/cp -r %s/src/libdcp/xsd %%{buildroot}/usr/share/libdcp' % target.directory, file=f)
@@ -436,11 +434,6 @@ def dependencies(target, options):
deps.append(('libsub', 'v1.6.6'))
deps.append(('leqm-nrt', '93ae9e6'))
deps.append(('rtaudio', 'f619b76'))
- # We get our OpenSSL libraries from the environment, but we
- # also need a patched openssl binary to make certificates.
- # This dependency is to get that binary, which is added into
- # the appropriate place later
- deps.append(('openssl', '7f29dd5'))
if can_build_disk(target):
deps.append(('lwext4', 'cce3730'))
deps.append(('ffcmp', '6259cd4'))
@@ -700,7 +693,6 @@ def make_appimage(target, nice_name, internal_name, version):
appdir = f'build/{nice_filename}.AppDir'
os.makedirs(f'{appdir}/usr/bin')
target.command(f'cp {target.directory}/bin/{internal_name} {appdir}/usr/bin')
- target.command(f'cp {target.directory}/src/openssl/apps/openssl {appdir}/usr/bin/dcpomatic2_openssl')
target.command(f'cp {target.directory}/bin/dcpverify {appdir}/usr/bin/dcpomatic2_verify')
target.command(f'mkdir -p {appdir}/usr/share/libdcp')
target.command(f'cp -r {target.directory}/share/dcpomatic2 {appdir}/usr/share/')