Skip to content
Snippets Groups Projects
Commit 2e7664bc authored by Simon McVittie's avatar Simon McVittie
Browse files

build-relocatable-install: Separate copyright files for util-linux


Unusually, libblkid1 and libmount1 have different copyright files
despite being from the same package. Ship both.

Signed-off-by: default avatarSimon McVittie <smcv@collabora.com>
parent 7e3425fa
No related branches found
No related tags found
1 merge request!317Publish pressure-vessel releases, separate from scout releases
...@@ -29,7 +29,7 @@ programs and libraries: ...@@ -29,7 +29,7 @@ programs and libraries:
- bubblewrap: [LGPL-2.0-or-later][]. See bubblewrap.txt. - bubblewrap: [LGPL-2.0-or-later][]. See bubblewrap.txt.
- libblkid.so.1, libmount.so.1 from util-linux: [LGPL-2.1-or-later][]. - libblkid.so.1, libmount.so.1 from util-linux: [LGPL-2.1-or-later][].
See util-linux.txt. See libblkid1.txt, libmount1.txt.
- libffi.so.6 from libffi: [MIT][]. See libffi.txt. - libffi.so.6 from libffi: [MIT][]. See libffi.txt.
......
...@@ -85,6 +85,7 @@ DEPENDENCIES = { ...@@ -85,6 +85,7 @@ DEPENDENCIES = {
WRAPPED_PROGRAMS = { WRAPPED_PROGRAMS = {
'bwrap': 'bubblewrap', 'bwrap': 'bubblewrap',
} }
# same as DEPENDENCIES
PRIMARY_ARCH_DEPENDENCIES = { PRIMARY_ARCH_DEPENDENCIES = {
'bubblewrap': 'bubblewrap', 'bubblewrap': 'bubblewrap',
'libblkid1': 'util-linux', 'libblkid1': 'util-linux',
...@@ -97,9 +98,15 @@ PRIMARY_ARCH_DEPENDENCIES = { ...@@ -97,9 +98,15 @@ PRIMARY_ARCH_DEPENDENCIES = {
'libselinux1': 'libselinux', 'libselinux1': 'libselinux',
'libxau6': 'libxau', 'libxau6': 'libxau',
} }
# executable => binary package in DEPENDENCIES
HELPERS = { HELPERS = {
'wflinfo': 'waffle-utils-multiarch', 'wflinfo': 'waffle-utils-multiarch',
} }
# Packages where different binary packages can have different copyright
# files
DIFFERENT_COPYRIGHT_FILES = [
'util-linux',
]
SCRIPTS = [ SCRIPTS = [
'pressure-vessel-locale-gen', 'pressure-vessel-locale-gen',
'pressure-vessel-test-ui', 'pressure-vessel-test-ui',
...@@ -522,14 +529,24 @@ def main(): ...@@ -522,14 +529,24 @@ def main():
if os.path.exists('/usr/share/doc/{}/copyright'.format(package)): if os.path.exists('/usr/share/doc/{}/copyright'.format(package)):
installed_binaries.add(package) installed_binaries.add(package)
install( if source in DIFFERENT_COPYRIGHT_FILES:
'/usr/share/doc/{}/copyright'.format(package), install(
os.path.join( '/usr/share/doc/{}/copyright'.format(package),
installation, os.path.join(
'metadata', installation,
'{}.txt'.format(source), 'metadata',
), '{}.txt'.format(package),
) ),
)
else:
install(
'/usr/share/doc/{}/copyright'.format(package),
os.path.join(
installation,
'metadata',
'{}.txt'.format(source),
),
)
for expr in set( for expr in set(
v_check_output([ v_check_output([
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment