diff mbox series

sbuild: always start build with a fresh sbuild.conf

Message ID 20220719150358.27737-1-henning.schild@siemens.com
State Accepted, archived
Headers show
Series sbuild: always start build with a fresh sbuild.conf | expand

Commit Message

Henning Schild July 19, 2022, 7:03 a.m. UTC 
So that rebuilds do not have to deal with old files, potentially
generated with older isar code.

Signed-off-by: Henning Schild <henning.schild@siemens.com>
---
 meta/classes/dpkg.bbclass | 2 ++
 1 file changed, 2 insertions(+)

Comments

Anton Mikanovich July 25, 2022, 10:53 p.m. UTC | #1 
19.07.2022 18:03, Henning Schild wrote:
> So that rebuilds do not have to deal with old files, potentially
> generated with older isar code.
>
> Signed-off-by: Henning Schild <henning.schild@siemens.com>
> ---
>   meta/classes/dpkg.bbclass | 2 ++
>   1 file changed, 2 insertions(+)
>
> diff --git a/meta/classes/dpkg.bbclass b/meta/classes/dpkg.bbclass
> index b726ea9d8473..2144ef0d3e43 100644
> --- a/meta/classes/dpkg.bbclass
> +++ b/meta/classes/dpkg.bbclass
> @@ -18,6 +18,8 @@ dpkg_runbuild() {
>       export DEB_BUILD_OPTIONS="${@ isar_deb_build_options(d)}"
>       export PARALLEL_MAKE="${PARALLEL_MAKE}"
>   
> +    rm -f ${SBUILD_CONFIG}
> +
>       env | while read -r line; do
>           # Filter the same lines
>           grep -q "^${line}" ${DPKG_PREBUILD_ENV_FILE} && continue

Applied to next, thanks.
diff mbox series

Patch

diff --git a/meta/classes/dpkg.bbclass b/meta/classes/dpkg.bbclass
index b726ea9d8473..2144ef0d3e43 100644
--- a/meta/classes/dpkg.bbclass
+++ b/meta/classes/dpkg.bbclass
@@ -18,6 +18,8 @@  dpkg_runbuild() {
     export DEB_BUILD_OPTIONS="${@ isar_deb_build_options(d)}"
     export PARALLEL_MAKE="${PARALLEL_MAKE}"
 
+    rm -f ${SBUILD_CONFIG}
+
     env | while read -r line; do
         # Filter the same lines
         grep -q "^${line}" ${DPKG_PREBUILD_ENV_FILE} && continue