On Mon, 2021-11-01 at 01:03 +0100, Peter Kjellerstedt wrote:
> /var/log is normally a link to /var/volatile/log and /var/volatile is a
> tmpfs mount. So anything created in /var/log will not be available when
> the tmpfs is mounted.
>
> Also some whitespace clean up.
>
> Signed-off-by: Peter Kjellerstedt <peter.kjellerst...@axis.com>
> ---
> meta/recipes-devtools/apt/apt_2.2.4.bb | 30 ++++++++++++++------------
> 1 file changed, 16 insertions(+), 14 deletions(-)
>
> diff --git a/meta/recipes-devtools/apt/apt_2.2.4.bb
> b/meta/recipes-devtools/apt/apt_2.2.4.bb
> index 29fc49fb39..3d88371169 100644
> --- a/meta/recipes-devtools/apt/apt_2.2.4.bb
> +++ b/meta/recipes-devtools/apt/apt_2.2.4.bb
> @@ -51,9 +51,8 @@ EXTRA_OECMAKE:append = " -DCURRENT_VENDOR=debian
> -DWITH_DOC=False \
> -DWITH_TESTS=False \
> "
>
> -do_configure:prepend () {
> - echo "set( CMAKE_FIND_ROOT_PATH_MODE_INCLUDE BOTH )" >>
> ${WORKDIR}/toolchain.cmake
> -
> +do_configure:prepend() {
> + echo "set( CMAKE_FIND_ROOT_PATH_MODE_INCLUDE BOTH )" >>
> ${WORKDIR}/toolchain.cmake
> }
>
> # Unfortunately apt hardcodes this all over the place
> @@ -61,7 +60,7 @@ FILES:${PN} += "${prefix}/lib/dpkg ${prefix}/lib/apt"
> RDEPENDS:${PN} += "bash perl dpkg"
>
> customize_apt_conf_sample() {
> - cat > ${D}${sysconfdir}/apt/apt.conf.sample << EOF
> + cat > ${D}${sysconfdir}/apt/apt.conf.sample << EOF
> Dir "${STAGING_DIR_NATIVE}/"
> {
> State "var/lib/apt/"
> @@ -114,22 +113,25 @@ EOF
> }
>
> do_install:append:class-native() {
> - customize_apt_conf_sample
> + customize_apt_conf_sample
> }
>
> do_install:append:class-nativesdk() {
> - customize_apt_conf_sample
> + customize_apt_conf_sample
> }
>
> -
> do_install:append:class-target() {
> - #Write the correct apt-architecture to apt.conf
> - APT_CONF=${D}/etc/apt/apt.conf
> - echo 'APT::Architecture "${DPKG_ARCH}";' > ${APT_CONF}
> + # Write the correct apt-architecture to apt.conf
> + APT_CONF=${D}${sysconfdir}/apt/apt.conf
> + echo 'APT::Architecture "${DPKG_ARCH}";' > ${APT_CONF}
> }
>
> -# Avoid non-reproducible -src package
> -do_install:append () {
> - sed -i -e "s,${B},,g" \
> - ${B}/apt-pkg/tagfile-keys.cc
> +do_install:append() {
> + # Remove /var/log/apt. /var/log is normally a link to /var/volatile/log
> + # and /var/volatile is a tmpfs mount. So anything created in /var/log
> + # will not be available when the tmpfs is mounted.
> + rm -rf ${D}${localstatedir}/log
> +
> + # Avoid non-reproducible -src package
> + sed -i -e "s,${B},,g" ${B}/apt-pkg/tagfile-keys.cc
> }
I didn't bisect it down but this looks likely to be from this change:
https://autobuilder.yoctoproject.org/typhoon/#/builders/79/builds/2796/steps/14/logs/stdio
https://autobuilder.yoctoproject.org/typhoon/#/builders/50/builds/4279/steps/11/logs/stdio
https://autobuilder.yoctoproject.org/typhoon/#/builders/76/builds/4260/steps/14/logs/stdio
https://autobuilder.yoctoproject.org/typhoon/#/builders/115/builds/919/steps/12/logs/stdio
(and more)
Cheers,
Richard
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#157805):
https://lists.openembedded.org/g/openembedded-core/message/157805
Mute This Topic: https://lists.openembedded.org/mt/86728998/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
