Commit 41bbc2d7 authored by locallycompact-ct's avatar locallycompact-ct

Fix several implicitly transitive build-dependencies in devel-system.

Chunks in strata should declare all build-depends of their sibling
chunks explicitly, so that the build tool does not need to overcompensate
by bringing them in transitively.

These were discovered using a baserock V10 version of ybd and then backported.
parent 8899677a
Pipeline #5163340 failed with stage
in 1201 minutes
......@@ -54,6 +54,8 @@ chunks:
build-depends:
- autoconf-tarball
- automake
- perl
- texinfo-tarball
# Note: autoconf's version number must be set in autoconf's chunk morph,
# so if you update autoconf be sure to also update the version number
# in strata/core/autoconf.morph
......@@ -67,6 +69,7 @@ chunks:
- automake
- help2man
- texinfo-tarball
- perl
- name: libtool-tarball
morph: strata/core/libtool-tarball.morph
repo: upstream:libtool-tarball
......@@ -87,6 +90,7 @@ chunks:
- automake
- file
- libtool-tarball
- perl
- name: openssl-new
morph: strata/core/openssl-new.morph
repo: upstream:openssl-new
......@@ -151,6 +155,7 @@ chunks:
- file
- libtool-tarball
- openssl-new
- perl
- name: gettext-tarball
morph: strata/core/gettext-tarball.morph
repo: upstream:gettext-tarball
......@@ -170,15 +175,19 @@ chunks:
- gettext-tarball
- libexpat
- openssl-new
- perl
- name: flex
morph: strata/core/flex.morph
repo: upstream:flex
ref: de10f98e8a2dc2a021796811490d0f30c3cd90bf
unpetrify-ref: baserock/build-essential
build-depends:
- perl
- autoconf
- automake
- file
- gettext-tarball
- texinfo-tarball
- name: mini-utils
morph: strata/core/mini-utils.morph
repo: baserock:baserock/mini-utils
......@@ -195,8 +204,11 @@ chunks:
- flex
- gettext-tarball
- git-minimal
- openssl-new
- help2man
- mini-utils
- perl
- texinfo-tarball
submodules:
submodules/autoconf:
url: upstream:autoconf
......@@ -212,7 +224,9 @@ chunks:
- automake
- bison
- git-minimal
- openssl-new
- mini-utils
- perl
submodules:
gnulib:
url: upstream:gnulib
......@@ -227,6 +241,7 @@ chunks:
- file
- gettext-tarball
- libtool-tarball
- perl
- name: libtool
repo: upstream:libtool
ref: f09d00cbcf924c378573163e244fffeb8d28005f
......@@ -238,9 +253,12 @@ chunks:
- file
- help2man
- git-minimal
- openssl-new
- patch
- texinfo-tarball
- xz
- perl
- mini-utils
submodules:
gnulib:
url: upstream:gnulib
......@@ -253,6 +271,7 @@ chunks:
- autoconf
- automake
- libtool
- perl
- name: attr
morph: strata/core/attr.morph
repo: upstream:attr
......@@ -264,6 +283,7 @@ chunks:
- automake
- gettext-tarball
- libtool
- perl
- name: acl
morph: strata/core/acl.morph
repo: upstream:acl
......@@ -275,6 +295,7 @@ chunks:
- gettext-tarball
- libtool
- attr
- perl
- name: linux-pam
morph: strata/core/linux-pam.morph
repo: upstream:linux-pam
......@@ -289,6 +310,7 @@ chunks:
- flex
- attr
- acl
- perl
- name: libcap2
morph: strata/core/libcap2.morph
repo: upstream:libcap2
......@@ -303,6 +325,7 @@ chunks:
- attr
- acl
- linux-pam
- perl
- name: shadow
morph: strata/core/shadow.morph
repo: upstream:shadow
......@@ -318,6 +341,7 @@ chunks:
- acl
- linux-pam
- libcap2
- perl
- name: util-linux
morph: strata/core/util-linux.morph
repo: upstream:util-linux
......@@ -328,10 +352,12 @@ chunks:
- automake
- gettext-tarball
- git-minimal
- openssl-new
- libtool
- pkg-config
- linux-pam
- shadow
- perl
- name: e2fsprogs
morph: strata/core/e2fsprogs.morph
repo: upstream:e2fsprogs
......@@ -351,9 +377,11 @@ chunks:
- automake
- file
- libtool
- libexpat
- pkg-config
- python3
- xz
- perl
- name: libxslt
repo: upstream:libxslt
ref: 73e08bf7c36a9145d38f51d37e66529b873c011a
......@@ -365,6 +393,8 @@ chunks:
- automake
- file
- libxml2
- xz
- perl
- name: XML-Parser
repo: upstream:XML-Parser
ref: e1a3ec157140a699e3020836475a0df622f70f1b
......@@ -379,6 +409,7 @@ chunks:
unpetrify-ref: baserock/morph
build-system: autotools
build-depends:
- libexpat
- XML-Parser
- autoconf
- automake
......@@ -411,6 +442,7 @@ chunks:
unpetrify-ref: baserock/morph
build-system: autotools
build-depends:
- perl
- flex
- texinfo-tarball
- name: libseccomp
......@@ -422,3 +454,4 @@ chunks:
- autoconf
- automake
- libtool
- perl
......@@ -55,6 +55,7 @@ chunks:
- dbus-pre
- kmod
- libgcrypt
- libgpg-error
- name: libusb
repo: upstream:libusb
ref: 01d6a03f417eb5dbac6ce039febdabdc4954c763
......@@ -69,6 +70,7 @@ chunks:
build-system: autotools
build-depends:
- libusb
- systemd
submodules:
usbhid-dump:
url: upstream:usbhid-dump
......@@ -96,6 +98,8 @@ chunks:
unpetrify-ref: baserock/dbus-1.10.6-capi-patches
build-depends:
- systemd
- libgcrypt
- libgpg-error
- name: openssh
morph: strata/foundation/openssh.morph
repo: upstream:openssh-git
......
......@@ -51,6 +51,7 @@ chunks:
unpetrify-ref: 1.3.2
build-system: python-distutils
build-depends:
- pycparser
- pyasn1
- enum34
- cffi
......
......@@ -30,6 +30,7 @@ chunks:
build-depends:
- gpgme
- libgsystem
- libassuan
submodules:
libglnx:
url: upstream:libglnx
......
......@@ -34,6 +34,7 @@ chunks:
ref: 0708fbe62617a63300e1cc3b9869cc1280c57ef6
unpetrify-ref: baserock/v1.6.2
build-depends:
- libyaml
- ruby
- name: hoe
morph: strata/ruby/hoe.morph
......@@ -42,10 +43,12 @@ chunks:
unpetrify-ref: master
build-depends:
- ruby
- libyaml
- name: rake-compiler
morph: strata/ruby/rake-compiler.morph
repo: upstream:ruby-gems/rake-compiler
ref: aaed621f6fdb0b0395775fea5464cc83e794fbdb
unpetrify-ref: v0.9.3
build-depends:
- libyaml
- ruby
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment