| Message ID | 20240205114837.96599-1-felix.moessbauer@siemens.com |
|---|---|
| State | Accepted, archived |
| Headers | show |
| Series | [1/1] fix: clean apt-cache dirs in dpkg_runbuild as root | expand |
On Mon, 2024-02-05 at 12:48 +0100, 'Felix Moessbauer' via isar-users wrote: > This patch fixes a regression introduced in a0b293c5: The cleaning > of the rootfs dir before dpkg_runbuild needs to be performed as root, > as > this dir might contain data which cannot be deleted by the default > user. > > Reported-by: Jan Kiszka <jan.kiszka@siemens.com> > Signed-off-by: Felix Moessbauer <felix.moessbauer@siemens.com> > --- > meta/classes/dpkg.bbclass | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/meta/classes/dpkg.bbclass b/meta/classes/dpkg.bbclass > index 3fc29806..0578977d 100644 > --- a/meta/classes/dpkg.bbclass > +++ b/meta/classes/dpkg.bbclass > @@ -34,7 +34,7 @@ CP_FLAGS ?= "-Ln --no-preserve=owner" > CP_FLAGS:sid ?= "-L --update=none --no-preserve=owner" > > # Build package from sources using build script > -dpkg_runbuild[cleandirs] += "${WORKDIR}/rootfs" > +dpkg_runbuild[root_cleandirs] += "${WORKDIR}/rootfs" > dpkg_runbuild[vardepsexclude] += "${SBUILD_PASSTHROUGH_ADDITIONS}" > dpkg_runbuild() { > E="${@ isar_export_proxies(d)}" > -- > 2.39.2 > This has passed internal CI, so if noone against, we could merge this fix faster than usually. Jan, could you confirm that it fixes the regression you've discovered with rebuilding?
On 07.02.24 09:19, Uladzimir Bely wrote: > On Mon, 2024-02-05 at 12:48 +0100, 'Felix Moessbauer' via isar-users > wrote: >> This patch fixes a regression introduced in a0b293c5: The cleaning >> of the rootfs dir before dpkg_runbuild needs to be performed as root, >> as >> this dir might contain data which cannot be deleted by the default >> user. >> >> Reported-by: Jan Kiszka <jan.kiszka@siemens.com> >> Signed-off-by: Felix Moessbauer <felix.moessbauer@siemens.com> >> --- >> meta/classes/dpkg.bbclass | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/meta/classes/dpkg.bbclass b/meta/classes/dpkg.bbclass >> index 3fc29806..0578977d 100644 >> --- a/meta/classes/dpkg.bbclass >> +++ b/meta/classes/dpkg.bbclass >> @@ -34,7 +34,7 @@ CP_FLAGS ?= "-Ln --no-preserve=owner" >> CP_FLAGS:sid ?= "-L --update=none --no-preserve=owner" >> >> # Build package from sources using build script >> -dpkg_runbuild[cleandirs] += "${WORKDIR}/rootfs" >> +dpkg_runbuild[root_cleandirs] += "${WORKDIR}/rootfs" >> dpkg_runbuild[vardepsexclude] += "${SBUILD_PASSTHROUGH_ADDITIONS}" >> dpkg_runbuild() { >> E="${@ isar_export_proxies(d)}" >> -- >> 2.39.2 >> > > This has passed internal CI, so if noone against, we could merge this > fix faster than usually. > > Jan, could you confirm that it fixes the regression you've discovered > with rebuilding? Tested-by: Jan Kiszka <jan.kiszka@siemens.com> Thanks, Jan
On Mon, 2024-02-05 at 12:48 +0100, 'Felix Moessbauer' via isar-users wrote: > This patch fixes a regression introduced in a0b293c5: The cleaning > of the rootfs dir before dpkg_runbuild needs to be performed as root, > as > this dir might contain data which cannot be deleted by the default > user. > > Reported-by: Jan Kiszka <jan.kiszka@siemens.com> > Signed-off-by: Felix Moessbauer <felix.moessbauer@siemens.com> > --- > meta/classes/dpkg.bbclass | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/meta/classes/dpkg.bbclass b/meta/classes/dpkg.bbclass > index 3fc29806..0578977d 100644 > --- a/meta/classes/dpkg.bbclass > +++ b/meta/classes/dpkg.bbclass > @@ -34,7 +34,7 @@ CP_FLAGS ?= "-Ln --no-preserve=owner" > CP_FLAGS:sid ?= "-L --update=none --no-preserve=owner" > > # Build package from sources using build script > -dpkg_runbuild[cleandirs] += "${WORKDIR}/rootfs" > +dpkg_runbuild[root_cleandirs] += "${WORKDIR}/rootfs" > dpkg_runbuild[vardepsexclude] += "${SBUILD_PASSTHROUGH_ADDITIONS}" > dpkg_runbuild() { > E="${@ isar_export_proxies(d)}" > -- > 2.39.2 > Applied to next, thanks.
diff --git a/meta/classes/dpkg.bbclass b/meta/classes/dpkg.bbclass index 3fc29806..0578977d 100644 --- a/meta/classes/dpkg.bbclass +++ b/meta/classes/dpkg.bbclass @@ -34,7 +34,7 @@ CP_FLAGS ?= "-Ln --no-preserve=owner" CP_FLAGS:sid ?= "-L --update=none --no-preserve=owner" # Build package from sources using build script -dpkg_runbuild[cleandirs] += "${WORKDIR}/rootfs" +dpkg_runbuild[root_cleandirs] += "${WORKDIR}/rootfs" dpkg_runbuild[vardepsexclude] += "${SBUILD_PASSTHROUGH_ADDITIONS}" dpkg_runbuild() { E="${@ isar_export_proxies(d)}"
This patch fixes a regression introduced in a0b293c5: The cleaning of the rootfs dir before dpkg_runbuild needs to be performed as root, as this dir might contain data which cannot be deleted by the default user. Reported-by: Jan Kiszka <jan.kiszka@siemens.com> Signed-off-by: Felix Moessbauer <felix.moessbauer@siemens.com> --- meta/classes/dpkg.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)