From a4fbd1fdbc5e556f4211fd9d39d673be56cabdcd Mon Sep 17 00:00:00 2001 From: ZhangXiao Date: Fri, 22 Apr 2022 16:18:21 +0800 Subject: [PATCH] circular_dep.conf: Adjust the build order, build systemd firstly Run `build-image -c -a` twice, when building linux: libudev-dev : Depends: libudev1 (= 247.3-6.stx.4) but 247.3-7 is to be installed Parameter "-c" will clear repository deb-local-build thus all stx binary packages been deleted. While in container pkgbuilder, its chroot is taint that binary package libudev1 from previous build is still in it. But all its brother packages stored in deb-local-build have been deleted. Source package linux build depend on libudev-dev, so pkgbuilder will try to install it into chroot. Now the only libudev-dev available is the one from Debian upstream. Binary package libudev-dev strictly runtime depends on binary package libudev1 with the same version, so the upstream libudev1 is also required. But, in chroot, a higher version libudev1 is already exist, thus cause this issue. To workaround this issue, adjust the build order to build systemd firstly. Test Plan: Pass: `build-image -c -a` twice Story: 20082862 Task: 45154 Signed-off-by: ZhangXiao Change-Id: I7b7513ac7ffae93c8356c260218818c0aa96ba5d --- build-tools/stx/circular_dep.conf | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build-tools/stx/circular_dep.conf b/build-tools/stx/circular_dep.conf index 601dd2fa..18572906 100644 --- a/build-tools/stx/circular_dep.conf +++ b/build-tools/stx/circular_dep.conf @@ -22,7 +22,7 @@ SRC SET: linux-rt BUILD ORDER: linux-rt SRC SET: openldap systemd linux setuptools -BUILD ORDER: linux setuptools openldap systemd +BUILD ORDER: systemd linux setuptools openldap # A superset of the chain: {openldap systemd linux}, just add package "setuptools" # The relationships between "setuptools" and other packages # setuptools(s) -b> debhelper -r> dh-autoreconf -r> libtool -r> libc6-dev -r> linux-libc-dev(linux) @@ -38,7 +38,7 @@ BUILD ORDER: linux setuptools openldap systemd # | -b> -----------------------------/ SRC SET: openldap systemd linux -BUILD ORDER: linux openldap systemd +BUILD ORDER: systemd linux openldap # --> linux <-----> systemd <----> openldap ---| # |---------------------------------------------| # openldap(s) -b> debhelper -r> man-db -r> bsdmainutils -r> bsdutils -r> libsystemd(systemd) @@ -83,7 +83,7 @@ BUILD ORDER: linux openldap systemd # | -b> quilt -r> bsdmainutils -r> bsdutils -r> --------------------------/ SRC SET: openldap systemd -BUILD ORDER: openldap systemd +BUILD ORDER: systemd openldap # openldap <------> systemd # openldap(s) -b> debhelper -r> man-db -r> bsdmainutils -r> bsdutils -r> libsystemd0(systemd) # systemd(s) -b> libcurl4-gnutls-dev -r> libcurl3-gnutls -r> libldap-2.4-2(openldap)