From a8185e64ce95fb0edd2696922133e0d60079246b78ad0bf4771bebd5a46668b8 Mon Sep 17 00:00:00 2001 From: Richard Brown Date: Tue, 14 May 2024 08:55:32 +0000 Subject: [PATCH 1/9] OBS-URL: https://build.opensuse.org/package/show/devel:microos:aeon/containment-tik-img-to-rpm?expand=0&rev=12 --- containment-tik-img-to-rpm | 10 ++++++++++ containment-tik-img-to-rpm.spec | 15 ++++++--------- 2 files changed, 16 insertions(+), 9 deletions(-) diff --git a/containment-tik-img-to-rpm b/containment-tik-img-to-rpm index c4a3534..3729f7a 100644 --- a/containment-tik-img-to-rpm +++ b/containment-tik-img-to-rpm @@ -14,6 +14,16 @@ log() { echo "[tik-img-to-rpm] $@" } +log "DEBUG: ls /" +ls / + +log "DEBUG: ls ." +ls . + +log "DEBUG: cat /.buildenv" +cat /.buildenv + + log "Check for tik-osimage-*.raw.xz in KIWI output directory" if ! ls ${img_dir}/tik-osimage-*.raw.xz; then log "No tik-osimage found" && exit 0 diff --git a/containment-tik-img-to-rpm.spec b/containment-tik-img-to-rpm.spec index 7e72a29..d4d3409 100644 --- a/containment-tik-img-to-rpm.spec +++ b/containment-tik-img-to-rpm.spec @@ -15,23 +15,21 @@ # Please submit bugfixes or comments via https://bugs.opensuse.org/ # -# norootforbuild Name: containment-tik-img-to-rpm Version: 1.0 Release: 0 -Summary: OBS Post check for containing tik-osimage-* images in RPM +Summary: OBS Post check for containing tik-osimage-* images in RPM License: MIT Source: containment-tik-img-to-rpm -Source1: image.spec.in +Source1: image.spec.in BuildRequires: filesystem -BuildArch: noarch +BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build -Requires: jq -Requires: gawk Requires: coreutils -Conflicts: containment-rpm - +Requires: gawk +Requires: jq +Conflicts: containment-rpm %description OBS Post check for containing tik-osimage-* images in RPM @@ -52,4 +50,3 @@ install -m 644 %{SOURCE1} %{buildroot}/usr/lib/build/ %{_prefix}/lib/build/image.spec.in %changelog - From bce5522d79378216443e16bcf527cddee84d1045073e5e3cdd4eb14e464e169b Mon Sep 17 00:00:00 2001 From: Richard Brown Date: Tue, 14 May 2024 09:19:00 +0000 Subject: [PATCH 2/9] OBS-URL: https://build.opensuse.org/package/show/devel:microos:aeon/containment-tik-img-to-rpm?expand=0&rev=13 --- containment-tik-img-to-rpm | 21 +++++++++++++++------ containment-tik-img-to-rpm.spec | 15 +++++++++------ 2 files changed, 24 insertions(+), 12 deletions(-) diff --git a/containment-tik-img-to-rpm b/containment-tik-img-to-rpm index 3729f7a..68e9e73 100644 --- a/containment-tik-img-to-rpm +++ b/containment-tik-img-to-rpm @@ -14,14 +14,23 @@ log() { echo "[tik-img-to-rpm] $@" } -log "DEBUG: ls /" -ls / +log "DEBUG: ls /usr/src/packages" +ls /usr/src/packages -log "DEBUG: ls ." -ls . +log "DEBUG: ls /usr/src/packages/KIWI" +ls /usr/src/packages/KIWI -log "DEBUG: cat /.buildenv" -cat /.buildenv +log "DEBUG: ls /usr/src/packages/SOURCES" +ls /usr/src/packages/SOURCES + +log "DEBUG: ls /usr/src" +ls /usr/src + +log "DEBUG: ls /usr/lib/build" +ls /usr/lib/build + +log "DEBUG: ls /.build-srcdir" +ls /.build-srcdir log "Check for tik-osimage-*.raw.xz in KIWI output directory" diff --git a/containment-tik-img-to-rpm.spec b/containment-tik-img-to-rpm.spec index d4d3409..7e72a29 100644 --- a/containment-tik-img-to-rpm.spec +++ b/containment-tik-img-to-rpm.spec @@ -15,21 +15,23 @@ # Please submit bugfixes or comments via https://bugs.opensuse.org/ # +# norootforbuild Name: containment-tik-img-to-rpm Version: 1.0 Release: 0 -Summary: OBS Post check for containing tik-osimage-* images in RPM +Summary: OBS Post check for containing tik-osimage-* images in RPM License: MIT Source: containment-tik-img-to-rpm -Source1: image.spec.in +Source1: image.spec.in BuildRequires: filesystem -BuildArch: noarch +BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build -Requires: coreutils -Requires: gawk Requires: jq -Conflicts: containment-rpm +Requires: gawk +Requires: coreutils +Conflicts: containment-rpm + %description OBS Post check for containing tik-osimage-* images in RPM @@ -50,3 +52,4 @@ install -m 644 %{SOURCE1} %{buildroot}/usr/lib/build/ %{_prefix}/lib/build/image.spec.in %changelog + From 2b680543f4a2c9715b6a6ee49fbad477c7a9cda2fb5ad35a2e6ffe4fffd0aaed Mon Sep 17 00:00:00 2001 From: Richard Brown Date: Tue, 14 May 2024 09:34:22 +0000 Subject: [PATCH 3/9] OBS-URL: https://build.opensuse.org/package/show/devel:microos:aeon/containment-tik-img-to-rpm?expand=0&rev=14 --- containment-tik-img-to-rpm | 24 ++++-------------------- 1 file changed, 4 insertions(+), 20 deletions(-) diff --git a/containment-tik-img-to-rpm b/containment-tik-img-to-rpm index 68e9e73..9fdfe55 100644 --- a/containment-tik-img-to-rpm +++ b/containment-tik-img-to-rpm @@ -14,25 +14,6 @@ log() { echo "[tik-img-to-rpm] $@" } -log "DEBUG: ls /usr/src/packages" -ls /usr/src/packages - -log "DEBUG: ls /usr/src/packages/KIWI" -ls /usr/src/packages/KIWI - -log "DEBUG: ls /usr/src/packages/SOURCES" -ls /usr/src/packages/SOURCES - -log "DEBUG: ls /usr/src" -ls /usr/src - -log "DEBUG: ls /usr/lib/build" -ls /usr/lib/build - -log "DEBUG: ls /.build-srcdir" -ls /.build-srcdir - - log "Check for tik-osimage-*.raw.xz in KIWI output directory" if ! ls ${img_dir}/tik-osimage-*.raw.xz; then log "No tik-osimage found" && exit 0 @@ -58,8 +39,11 @@ for f in ${img_dir}/*.raw.xz; do -e "s@__OS_NAME__@${os_name}@g" \ < ${spec_in} \ > ${build_dir}/image.spec + + log "DEBUG: cat /.build-srcdir/*.changes" + cat /.build-srcdir/*.changes - touch ${build_dir}/image.changes + cp /.build-srcdir/*.changes ${build_dir}/image.changes # Local builds have the file already in place, that's not true on IBS if [ ! -f ${top_dir}/SOURCES/${image} ]; then From 62db857955b3c7818380751fae444a8bbce24d2e4761d567eafd35a8ef80c53d Mon Sep 17 00:00:00 2001 From: Richard Brown Date: Tue, 14 May 2024 09:43:47 +0000 Subject: [PATCH 4/9] OBS-URL: https://build.opensuse.org/package/show/devel:microos:aeon/containment-tik-img-to-rpm?expand=0&rev=15 --- containment-tik-img-to-rpm | 1 + 1 file changed, 1 insertion(+) diff --git a/containment-tik-img-to-rpm b/containment-tik-img-to-rpm index 9fdfe55..fbaaefa 100644 --- a/containment-tik-img-to-rpm +++ b/containment-tik-img-to-rpm @@ -44,6 +44,7 @@ for f in ${img_dir}/*.raw.xz; do cat /.build-srcdir/*.changes cp /.build-srcdir/*.changes ${build_dir}/image.changes + cat ${build_dir}/image.changes >> ${build_dir}/image.spec # Local builds have the file already in place, that's not true on IBS if [ ! -f ${top_dir}/SOURCES/${image} ]; then From cbae573d8fdc1451f0f7efcb96ccbcf7469c05398cc156adbf9896bda527d67a Mon Sep 17 00:00:00 2001 From: Richard Brown Date: Tue, 14 May 2024 09:45:54 +0000 Subject: [PATCH 5/9] OBS-URL: https://build.opensuse.org/package/show/devel:microos:aeon/containment-tik-img-to-rpm?expand=0&rev=16 --- containment-tik-img-to-rpm | 3 --- 1 file changed, 3 deletions(-) diff --git a/containment-tik-img-to-rpm b/containment-tik-img-to-rpm index fbaaefa..6800704 100644 --- a/containment-tik-img-to-rpm +++ b/containment-tik-img-to-rpm @@ -40,9 +40,6 @@ for f in ${img_dir}/*.raw.xz; do < ${spec_in} \ > ${build_dir}/image.spec - log "DEBUG: cat /.build-srcdir/*.changes" - cat /.build-srcdir/*.changes - cp /.build-srcdir/*.changes ${build_dir}/image.changes cat ${build_dir}/image.changes >> ${build_dir}/image.spec From 374c376fe2b75ff2e0c2d7a54a64692445e878c7e9a2092676ba465611b589f8 Mon Sep 17 00:00:00 2001 From: Richard Brown Date: Tue, 14 May 2024 10:11:40 +0000 Subject: [PATCH 6/9] - Handle changelog properly, to work with reproducible builds in Factory OBS-URL: https://build.opensuse.org/package/show/devel:microos:aeon/containment-tik-img-to-rpm?expand=0&rev=17 --- containment-tik-img-to-rpm | 5 ++++- containment-tik-img-to-rpm.changes | 6 ++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/containment-tik-img-to-rpm b/containment-tik-img-to-rpm index 6800704..0f3078a 100644 --- a/containment-tik-img-to-rpm +++ b/containment-tik-img-to-rpm @@ -41,7 +41,10 @@ for f in ${img_dir}/*.raw.xz; do > ${build_dir}/image.spec cp /.build-srcdir/*.changes ${build_dir}/image.changes - cat ${build_dir}/image.changes >> ${build_dir}/image.spec + ${build_dir}/changelog2spec --target rpm --file ${build_dir}/image.changes >> ${build_dir}/image.spec + + log "DEBUG: cat ${build_dir}/image.spec" + cat ${build_dir}/image.spec # Local builds have the file already in place, that's not true on IBS if [ ! -f ${top_dir}/SOURCES/${image} ]; then diff --git a/containment-tik-img-to-rpm.changes b/containment-tik-img-to-rpm.changes index 5d7c292..65b951c 100644 --- a/containment-tik-img-to-rpm.changes +++ b/containment-tik-img-to-rpm.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue May 14 09:49:57 UTC 2024 - Richard Brown + +- Handle changelog properly, to work with reproducible builds + in Factory + ------------------------------------------------------------------- Fri May 10 18:19:04 UTC 2024 - Richard Brown From fb02148893f58663ed0e89754257264dca0a724993d86c277273471bd9daa78d Mon Sep 17 00:00:00 2001 From: Richard Brown Date: Tue, 14 May 2024 10:34:17 +0000 Subject: [PATCH 7/9] OBS-URL: https://build.opensuse.org/package/show/devel:microos:aeon/containment-tik-img-to-rpm?expand=0&rev=18 --- containment-tik-img-to-rpm.spec | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/containment-tik-img-to-rpm.spec b/containment-tik-img-to-rpm.spec index 7e72a29..88a5913 100644 --- a/containment-tik-img-to-rpm.spec +++ b/containment-tik-img-to-rpm.spec @@ -15,23 +15,22 @@ # Please submit bugfixes or comments via https://bugs.opensuse.org/ # -# norootforbuild Name: containment-tik-img-to-rpm Version: 1.0 Release: 0 -Summary: OBS Post check for containing tik-osimage-* images in RPM +Summary: OBS Post check for containing tik-osimage-* images in RPM License: MIT Source: containment-tik-img-to-rpm -Source1: image.spec.in +Source1: image.spec.in BuildRequires: filesystem -BuildArch: noarch +BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build -Requires: jq -Requires: gawk +Requires: build Requires: coreutils -Conflicts: containment-rpm - +Requires: gawk +Requires: jq +Conflicts: containment-rpm %description OBS Post check for containing tik-osimage-* images in RPM @@ -52,4 +51,3 @@ install -m 644 %{SOURCE1} %{buildroot}/usr/lib/build/ %{_prefix}/lib/build/image.spec.in %changelog - From e00f42a874dae52fa456da4c73d3cb64093df64dc297a2cb9bc14119c1257562 Mon Sep 17 00:00:00 2001 From: Richard Brown Date: Tue, 14 May 2024 10:47:56 +0000 Subject: [PATCH 8/9] OBS-URL: https://build.opensuse.org/package/show/devel:microos:aeon/containment-tik-img-to-rpm?expand=0&rev=19 --- containment-tik-img-to-rpm.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/containment-tik-img-to-rpm.spec b/containment-tik-img-to-rpm.spec index 88a5913..0d43dcc 100644 --- a/containment-tik-img-to-rpm.spec +++ b/containment-tik-img-to-rpm.spec @@ -30,6 +30,7 @@ Requires: build Requires: coreutils Requires: gawk Requires: jq +Requires: perl-DateTime-Format-DateParse Conflicts: containment-rpm %description From f6ab4d4554d013fdf4d167535da39313127149fb9b340d8df6614f6f36669ea3 Mon Sep 17 00:00:00 2001 From: Richard Brown Date: Tue, 14 May 2024 10:59:15 +0000 Subject: [PATCH 9/9] OBS-URL: https://build.opensuse.org/package/show/devel:microos:aeon/containment-tik-img-to-rpm?expand=0&rev=20 --- containment-tik-img-to-rpm | 3 --- 1 file changed, 3 deletions(-) diff --git a/containment-tik-img-to-rpm b/containment-tik-img-to-rpm index 0f3078a..64895f7 100644 --- a/containment-tik-img-to-rpm +++ b/containment-tik-img-to-rpm @@ -43,9 +43,6 @@ for f in ${img_dir}/*.raw.xz; do cp /.build-srcdir/*.changes ${build_dir}/image.changes ${build_dir}/changelog2spec --target rpm --file ${build_dir}/image.changes >> ${build_dir}/image.spec - log "DEBUG: cat ${build_dir}/image.spec" - cat ${build_dir}/image.spec - # Local builds have the file already in place, that's not true on IBS if [ ! -f ${top_dir}/SOURCES/${image} ]; then ln ${f} ${top_dir}/SOURCES