From ee1d339c13cc4c2823a5333334a10c49031e660c01c7881f6d7729b0b3c325bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Tue, 8 Aug 2017 07:54:37 +0000 Subject: [PATCH 01/14] update OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/product-builder?expand=0&rev=25 --- product-builder-1.0~pre.1499777959.e6adac4.obscpio | 3 --- product-builder-1.0~pre.1502178671.92e2d56.obscpio | 3 +++ product-builder.changes | 5 +++++ product-builder.obsinfo | 6 +++--- product-builder.spec | 2 +- 5 files changed, 12 insertions(+), 7 deletions(-) delete mode 100644 product-builder-1.0~pre.1499777959.e6adac4.obscpio create mode 100644 product-builder-1.0~pre.1502178671.92e2d56.obscpio diff --git a/product-builder-1.0~pre.1499777959.e6adac4.obscpio b/product-builder-1.0~pre.1499777959.e6adac4.obscpio deleted file mode 100644 index 83e6e72..0000000 --- a/product-builder-1.0~pre.1499777959.e6adac4.obscpio +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e2735ab339c7c8b98795245afcbc7c2b3b699e419b935ba23e71beceb63e781f -size 1305612 diff --git a/product-builder-1.0~pre.1502178671.92e2d56.obscpio b/product-builder-1.0~pre.1502178671.92e2d56.obscpio new file mode 100644 index 0000000..8cac1ab --- /dev/null +++ b/product-builder-1.0~pre.1502178671.92e2d56.obscpio @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5e47c324788d5978261cc5e196b384e7bde21753ea41a96184f3816744ce47b2 +size 1305612 diff --git a/product-builder.changes b/product-builder.changes index 0da7422..47be7a2 100644 --- a/product-builder.changes +++ b/product-builder.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Aug 8 07:54:15 UTC 2017 - adrian@suse.de + +- always exit on error (bsc#1052017) + ------------------------------------------------------------------- Tue Jul 11 12:34:47 UTC 2017 - adrian@suse.de diff --git a/product-builder.obsinfo b/product-builder.obsinfo index 7327661..d11bdc1 100644 --- a/product-builder.obsinfo +++ b/product-builder.obsinfo @@ -1,5 +1,5 @@ name: product-builder -version: 1.0~pre.1499777959.e6adac4 -mtime: 1499777959 -commit: e6adac40d70bfd49cde311d9f91e48ad9b5e00d7 +version: 1.0~pre.1502178671.92e2d56 +mtime: 1502178671 +commit: 92e2d564345e339adcfc77ba5171327397e1140c diff --git a/product-builder.spec b/product-builder.spec index 1bed72a..21bcccd 100644 --- a/product-builder.spec +++ b/product-builder.spec @@ -23,7 +23,7 @@ Url: http://github.com/openSUSE/product-builder Name: product-builder Conflicts: kiwi Conflicts: kiwi-instsource -Version: 1.0~pre.1499777959.e6adac4 +Version: 1.0~pre.1502178671.92e2d56 Release: 0 Provides: kiwi-schema = 6.2 Source: product-builder-%version.tar.xz From cc4ed16d9607d02abc63330edc61d15d3ed5cc6b9d2be91ae5ee8ccc9903991c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Tue, 8 Aug 2017 09:45:43 +0000 Subject: [PATCH 02/14] go OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/product-builder?expand=0&rev=26 --- product-builder-1.0~pre.1502178671.92e2d56.obscpio | 3 --- product-builder-1.0~pre.1502185483.11b4287.obscpio | 3 +++ product-builder.obsinfo | 6 +++--- product-builder.spec | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) delete mode 100644 product-builder-1.0~pre.1502178671.92e2d56.obscpio create mode 100644 product-builder-1.0~pre.1502185483.11b4287.obscpio diff --git a/product-builder-1.0~pre.1502178671.92e2d56.obscpio b/product-builder-1.0~pre.1502178671.92e2d56.obscpio deleted file mode 100644 index 8cac1ab..0000000 --- a/product-builder-1.0~pre.1502178671.92e2d56.obscpio +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5e47c324788d5978261cc5e196b384e7bde21753ea41a96184f3816744ce47b2 -size 1305612 diff --git a/product-builder-1.0~pre.1502185483.11b4287.obscpio b/product-builder-1.0~pre.1502185483.11b4287.obscpio new file mode 100644 index 0000000..ff0999b --- /dev/null +++ b/product-builder-1.0~pre.1502185483.11b4287.obscpio @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:35ca7aa9bef3285276f17613e1a8cc9c451f1cca84ace42292a483730cb4e64e +size 1305612 diff --git a/product-builder.obsinfo b/product-builder.obsinfo index d11bdc1..0cc97f9 100644 --- a/product-builder.obsinfo +++ b/product-builder.obsinfo @@ -1,5 +1,5 @@ name: product-builder -version: 1.0~pre.1502178671.92e2d56 -mtime: 1502178671 -commit: 92e2d564345e339adcfc77ba5171327397e1140c +version: 1.0~pre.1502185483.11b4287 +mtime: 1502185483 +commit: 11b4287172f200572f089e4697e0766d29c7be43 diff --git a/product-builder.spec b/product-builder.spec index 21bcccd..c98e20d 100644 --- a/product-builder.spec +++ b/product-builder.spec @@ -23,7 +23,7 @@ Url: http://github.com/openSUSE/product-builder Name: product-builder Conflicts: kiwi Conflicts: kiwi-instsource -Version: 1.0~pre.1502178671.92e2d56 +Version: 1.0~pre.1502185483.11b4287 Release: 0 Provides: kiwi-schema = 6.2 Source: product-builder-%version.tar.xz From feb3d6a3a0c64bba06208e26fd71ddb526906e708d627823ce434ab9abfa9a77 Mon Sep 17 00:00:00 2001 From: Ruediger Oertel Date: Wed, 9 Aug 2017 09:13:01 +0000 Subject: [PATCH 03/14] - only use x86 boot image on s390/s390x if it exists - enforce default to abort on missing packages OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/product-builder?expand=0&rev=27 --- product-builder-1.0~pre.1502185483.11b4287.obscpio | 3 --- product-builder-1.0~pre.1502269746.098089c.obscpio | 3 +++ product-builder.changes | 6 ++++++ product-builder.obsinfo | 6 +++--- product-builder.spec | 2 +- 5 files changed, 13 insertions(+), 7 deletions(-) delete mode 100644 product-builder-1.0~pre.1502185483.11b4287.obscpio create mode 100644 product-builder-1.0~pre.1502269746.098089c.obscpio diff --git a/product-builder-1.0~pre.1502185483.11b4287.obscpio b/product-builder-1.0~pre.1502185483.11b4287.obscpio deleted file mode 100644 index ff0999b..0000000 --- a/product-builder-1.0~pre.1502185483.11b4287.obscpio +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:35ca7aa9bef3285276f17613e1a8cc9c451f1cca84ace42292a483730cb4e64e -size 1305612 diff --git a/product-builder-1.0~pre.1502269746.098089c.obscpio b/product-builder-1.0~pre.1502269746.098089c.obscpio new file mode 100644 index 0000000..d5c9bf8 --- /dev/null +++ b/product-builder-1.0~pre.1502269746.098089c.obscpio @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:07e678afee244a4ff281694e84954f8c19dccad64020253dcba1ad5464e832ee +size 1305612 diff --git a/product-builder.changes b/product-builder.changes index 47be7a2..bda9170 100644 --- a/product-builder.changes +++ b/product-builder.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Aug 9 11:12:20 CEST 2017 - ro@suse.de + +- only use x86 boot image on s390/s390x if it exists +- enforce default to abort on missing packages + ------------------------------------------------------------------- Tue Aug 8 07:54:15 UTC 2017 - adrian@suse.de diff --git a/product-builder.obsinfo b/product-builder.obsinfo index 0cc97f9..8c30d8f 100644 --- a/product-builder.obsinfo +++ b/product-builder.obsinfo @@ -1,5 +1,5 @@ name: product-builder -version: 1.0~pre.1502185483.11b4287 -mtime: 1502185483 -commit: 11b4287172f200572f089e4697e0766d29c7be43 +version: 1.0~pre.1502269746.098089c +mtime: 1502269746 +commit: 098089c8e113da6c18267d38f73044742ba35b25 diff --git a/product-builder.spec b/product-builder.spec index c98e20d..d821ed8 100644 --- a/product-builder.spec +++ b/product-builder.spec @@ -23,7 +23,7 @@ Url: http://github.com/openSUSE/product-builder Name: product-builder Conflicts: kiwi Conflicts: kiwi-instsource -Version: 1.0~pre.1502185483.11b4287 +Version: 1.0~pre.1502269746.098089c Release: 0 Provides: kiwi-schema = 6.2 Source: product-builder-%version.tar.xz From 20ff145695ea1e6ab61fc15e358ee777a263a7049cbdcc4ee4ceba3bcab45eba Mon Sep 17 00:00:00 2001 From: Ruediger Oertel Date: Wed, 9 Aug 2017 09:31:03 +0000 Subject: [PATCH 04/14] - also, on s390/s390x if we have a x86_64 image, make that bootable OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/product-builder?expand=0&rev=28 --- product-builder-1.0~pre.1502269746.098089c.obscpio | 3 --- product-builder-1.0~pre.1502270961.bdd5e74.obscpio | 3 +++ product-builder.changes | 1 + product-builder.obsinfo | 6 +++--- product-builder.spec | 2 +- 5 files changed, 8 insertions(+), 7 deletions(-) delete mode 100644 product-builder-1.0~pre.1502269746.098089c.obscpio create mode 100644 product-builder-1.0~pre.1502270961.bdd5e74.obscpio diff --git a/product-builder-1.0~pre.1502269746.098089c.obscpio b/product-builder-1.0~pre.1502269746.098089c.obscpio deleted file mode 100644 index d5c9bf8..0000000 --- a/product-builder-1.0~pre.1502269746.098089c.obscpio +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:07e678afee244a4ff281694e84954f8c19dccad64020253dcba1ad5464e832ee -size 1305612 diff --git a/product-builder-1.0~pre.1502270961.bdd5e74.obscpio b/product-builder-1.0~pre.1502270961.bdd5e74.obscpio new file mode 100644 index 0000000..0c9184d --- /dev/null +++ b/product-builder-1.0~pre.1502270961.bdd5e74.obscpio @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9561409ca1858bd0b11d135a67dba5a14a89cc3df0141b30d17e6f89ebc71881 +size 1305612 diff --git a/product-builder.changes b/product-builder.changes index bda9170..9fefe58 100644 --- a/product-builder.changes +++ b/product-builder.changes @@ -2,6 +2,7 @@ Wed Aug 9 11:12:20 CEST 2017 - ro@suse.de - only use x86 boot image on s390/s390x if it exists +- also, on s390/s390x if we have a x86_64 image, make that bootable - enforce default to abort on missing packages ------------------------------------------------------------------- diff --git a/product-builder.obsinfo b/product-builder.obsinfo index 8c30d8f..867b192 100644 --- a/product-builder.obsinfo +++ b/product-builder.obsinfo @@ -1,5 +1,5 @@ name: product-builder -version: 1.0~pre.1502269746.098089c -mtime: 1502269746 -commit: 098089c8e113da6c18267d38f73044742ba35b25 +version: 1.0~pre.1502270961.bdd5e74 +mtime: 1502270961 +commit: bdd5e74d7ee077ce1512d32a9c46e1785e5f3efd diff --git a/product-builder.spec b/product-builder.spec index d821ed8..6bb0d62 100644 --- a/product-builder.spec +++ b/product-builder.spec @@ -23,7 +23,7 @@ Url: http://github.com/openSUSE/product-builder Name: product-builder Conflicts: kiwi Conflicts: kiwi-instsource -Version: 1.0~pre.1502269746.098089c +Version: 1.0~pre.1502270961.bdd5e74 Release: 0 Provides: kiwi-schema = 6.2 Source: product-builder-%version.tar.xz From 5abd6042fd14b4c4e90b233d8eb7b9364a33f66785d3ad77bde5ffeb50eb999f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Mon, 21 Aug 2017 12:21:32 +0000 Subject: [PATCH 05/14] update OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/product-builder?expand=0&rev=29 --- product-builder-1.0~pre.1502270961.bdd5e74.obscpio | 3 --- product-builder-1.0~pre.1503317859.14d1a13.obscpio | 3 +++ product-builder.changes | 5 +++++ product-builder.obsinfo | 6 +++--- product-builder.spec | 7 ++++++- 5 files changed, 17 insertions(+), 7 deletions(-) delete mode 100644 product-builder-1.0~pre.1502270961.bdd5e74.obscpio create mode 100644 product-builder-1.0~pre.1503317859.14d1a13.obscpio diff --git a/product-builder-1.0~pre.1502270961.bdd5e74.obscpio b/product-builder-1.0~pre.1502270961.bdd5e74.obscpio deleted file mode 100644 index 0c9184d..0000000 --- a/product-builder-1.0~pre.1502270961.bdd5e74.obscpio +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9561409ca1858bd0b11d135a67dba5a14a89cc3df0141b30d17e6f89ebc71881 -size 1305612 diff --git a/product-builder-1.0~pre.1503317859.14d1a13.obscpio b/product-builder-1.0~pre.1503317859.14d1a13.obscpio new file mode 100644 index 0000000..4c84c02 --- /dev/null +++ b/product-builder-1.0~pre.1503317859.14d1a13.obscpio @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f91c90d39a1006a0f8e62836767d3009fba74d52825f03d2d0e50765d1bf9244 +size 1305612 diff --git a/product-builder.changes b/product-builder.changes index 9fefe58..be04feb 100644 --- a/product-builder.changes +++ b/product-builder.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Aug 21 12:18:40 UTC 2017 - adrian@suse.de + +- fix metapackage unpack loop + ------------------------------------------------------------------- Wed Aug 9 11:12:20 CEST 2017 - ro@suse.de diff --git a/product-builder.obsinfo b/product-builder.obsinfo index 867b192..2c6554a 100644 --- a/product-builder.obsinfo +++ b/product-builder.obsinfo @@ -1,5 +1,5 @@ name: product-builder -version: 1.0~pre.1502270961.bdd5e74 -mtime: 1502270961 -commit: bdd5e74d7ee077ce1512d32a9c46e1785e5f3efd +version: 1.0~pre.1503317859.14d1a13 +mtime: 1503317859 +commit: 14d1a13c01c20638af4d6066788f592363fcc6d7 diff --git a/product-builder.spec b/product-builder.spec index 6bb0d62..87e6ab0 100644 --- a/product-builder.spec +++ b/product-builder.spec @@ -23,8 +23,13 @@ Url: http://github.com/openSUSE/product-builder Name: product-builder Conflicts: kiwi Conflicts: kiwi-instsource -Version: 1.0~pre.1502270961.bdd5e74 +<<<<<<< ./product-builder.spec.mine +Version: 1.0~pre.1503317859.14d1a13 Release: 0 +======= +Version: 1.0~pre.1503317859.14d1a13 +Release: 0 +>>>>>>> ./product-builder.spec.r0ff8f0de04c2f43d9df4f23d686c1e9c Provides: kiwi-schema = 6.2 Source: product-builder-%version.tar.xz From cb17c603cba6a458d1ce3302dab3c317252fd705e847449d68a85098be17f22e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Mon, 21 Aug 2017 14:03:45 +0000 Subject: [PATCH 06/14] fix OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/product-builder?expand=0&rev=30 --- product-builder-1.0~pre.1503317859.14d1a13.obscpio | 3 --- product-builder-1.0~pre.1503323743.11ee104.obscpio | 3 +++ product-builder.obsinfo | 6 +++--- product-builder.spec | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) delete mode 100644 product-builder-1.0~pre.1503317859.14d1a13.obscpio create mode 100644 product-builder-1.0~pre.1503323743.11ee104.obscpio diff --git a/product-builder-1.0~pre.1503317859.14d1a13.obscpio b/product-builder-1.0~pre.1503317859.14d1a13.obscpio deleted file mode 100644 index 4c84c02..0000000 --- a/product-builder-1.0~pre.1503317859.14d1a13.obscpio +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f91c90d39a1006a0f8e62836767d3009fba74d52825f03d2d0e50765d1bf9244 -size 1305612 diff --git a/product-builder-1.0~pre.1503323743.11ee104.obscpio b/product-builder-1.0~pre.1503323743.11ee104.obscpio new file mode 100644 index 0000000..5f40ace --- /dev/null +++ b/product-builder-1.0~pre.1503323743.11ee104.obscpio @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5ee9e881e276dbf4dac0a16deb4ce908e1743da1c5dd3049dd67bb52e939bc97 +size 1305612 diff --git a/product-builder.obsinfo b/product-builder.obsinfo index 2c6554a..48936e1 100644 --- a/product-builder.obsinfo +++ b/product-builder.obsinfo @@ -1,5 +1,5 @@ name: product-builder -version: 1.0~pre.1503317859.14d1a13 -mtime: 1503317859 -commit: 14d1a13c01c20638af4d6066788f592363fcc6d7 +version: 1.0~pre.1503323743.11ee104 +mtime: 1503323743 +commit: 11ee1048c7dd18d6827bb8792be2da89a82f0860 diff --git a/product-builder.spec b/product-builder.spec index 87e6ab0..981321f 100644 --- a/product-builder.spec +++ b/product-builder.spec @@ -24,10 +24,10 @@ Name: product-builder Conflicts: kiwi Conflicts: kiwi-instsource <<<<<<< ./product-builder.spec.mine -Version: 1.0~pre.1503317859.14d1a13 +Version: 1.0~pre.1503323743.11ee104 Release: 0 ======= -Version: 1.0~pre.1503317859.14d1a13 +Version: 1.0~pre.1503323743.11ee104 Release: 0 >>>>>>> ./product-builder.spec.r0ff8f0de04c2f43d9df4f23d686c1e9c Provides: kiwi-schema = 6.2 From 2c774f886c17a32d5c18fa808ae4cdfc775e412f280bd5d21846ccfde10c03d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Mon, 21 Aug 2017 14:52:42 +0000 Subject: [PATCH 07/14] update OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/product-builder?expand=0&rev=31 --- product-builder-1.0~pre.1503323743.11ee104.obscpio | 3 --- product-builder-1.0~pre.1503326741.f9c347a.obscpio | 3 +++ product-builder.changes | 7 +++++++ product-builder.obsinfo | 6 +++--- product-builder.spec | 4 ++-- 5 files changed, 15 insertions(+), 8 deletions(-) delete mode 100644 product-builder-1.0~pre.1503323743.11ee104.obscpio create mode 100644 product-builder-1.0~pre.1503326741.f9c347a.obscpio diff --git a/product-builder-1.0~pre.1503323743.11ee104.obscpio b/product-builder-1.0~pre.1503323743.11ee104.obscpio deleted file mode 100644 index 5f40ace..0000000 --- a/product-builder-1.0~pre.1503323743.11ee104.obscpio +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5ee9e881e276dbf4dac0a16deb4ce908e1743da1c5dd3049dd67bb52e939bc97 -size 1305612 diff --git a/product-builder-1.0~pre.1503326741.f9c347a.obscpio b/product-builder-1.0~pre.1503326741.f9c347a.obscpio new file mode 100644 index 0000000..4736f97 --- /dev/null +++ b/product-builder-1.0~pre.1503326741.f9c347a.obscpio @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:52f5d545fb29c7d7a84e25b430e61d96a2e182ce26e7b8faa69dd642aecc04e8 +size 1422348 diff --git a/product-builder.changes b/product-builder.changes index be04feb..8dbe756 100644 --- a/product-builder.changes +++ b/product-builder.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Aug 21 14:47:29 UTC 2017 - adrian@suse.de + +- bring back media.1/products file + => means that pure repomd data is not anymore enough for YaST + installer + ------------------------------------------------------------------- Mon Aug 21 12:18:40 UTC 2017 - adrian@suse.de diff --git a/product-builder.obsinfo b/product-builder.obsinfo index 48936e1..fa2e36c 100644 --- a/product-builder.obsinfo +++ b/product-builder.obsinfo @@ -1,5 +1,5 @@ name: product-builder -version: 1.0~pre.1503323743.11ee104 -mtime: 1503323743 -commit: 11ee1048c7dd18d6827bb8792be2da89a82f0860 +version: 1.0~pre.1503326741.f9c347a +mtime: 1503326741 +commit: f9c347a8cfc241a72c748d751aec42ed1f246715 diff --git a/product-builder.spec b/product-builder.spec index 981321f..1f23571 100644 --- a/product-builder.spec +++ b/product-builder.spec @@ -24,10 +24,10 @@ Name: product-builder Conflicts: kiwi Conflicts: kiwi-instsource <<<<<<< ./product-builder.spec.mine -Version: 1.0~pre.1503323743.11ee104 +Version: 1.0~pre.1503326741.f9c347a Release: 0 ======= -Version: 1.0~pre.1503323743.11ee104 +Version: 1.0~pre.1503326741.f9c347a Release: 0 >>>>>>> ./product-builder.spec.r0ff8f0de04c2f43d9df4f23d686c1e9c Provides: kiwi-schema = 6.2 From 7cdb5809da3c3ecd27da1f3a618845b3125c0deeed8dca27301eb61c7f632c98 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Mon, 21 Aug 2017 14:54:18 +0000 Subject: [PATCH 08/14] fix OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/product-builder?expand=0&rev=32 --- product-builder.spec | 5 ----- 1 file changed, 5 deletions(-) diff --git a/product-builder.spec b/product-builder.spec index 1f23571..0a802c9 100644 --- a/product-builder.spec +++ b/product-builder.spec @@ -23,13 +23,8 @@ Url: http://github.com/openSUSE/product-builder Name: product-builder Conflicts: kiwi Conflicts: kiwi-instsource -<<<<<<< ./product-builder.spec.mine Version: 1.0~pre.1503326741.f9c347a Release: 0 -======= -Version: 1.0~pre.1503326741.f9c347a -Release: 0 ->>>>>>> ./product-builder.spec.r0ff8f0de04c2f43d9df4f23d686c1e9c Provides: kiwi-schema = 6.2 Source: product-builder-%version.tar.xz From 14088517a08fc7af62c141103f5192f7c94bc06541efe8df7a07cef0414190ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Mon, 21 Aug 2017 14:56:30 +0000 Subject: [PATCH 09/14] fix OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/product-builder?expand=0&rev=33 --- product-builder-1.0~pre.1503326741.f9c347a.obscpio | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/product-builder-1.0~pre.1503326741.f9c347a.obscpio b/product-builder-1.0~pre.1503326741.f9c347a.obscpio index 4736f97..8f833ff 100644 --- a/product-builder-1.0~pre.1503326741.f9c347a.obscpio +++ b/product-builder-1.0~pre.1503326741.f9c347a.obscpio @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:52f5d545fb29c7d7a84e25b430e61d96a2e182ce26e7b8faa69dd642aecc04e8 -size 1422348 +oid sha256:9c0e32907a186c9e14377790fd6f77735944c60dfc4e696eb3558c26c9842988 +size 1307148 From 28ec07a7c885ed0a06da88725107cdff569fc576a452fece8dfc7ab1fec65bab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Mon, 21 Aug 2017 15:05:39 +0000 Subject: [PATCH 10/14] fix OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/product-builder?expand=0&rev=34 --- product-builder-1.0~pre.1503326741.f9c347a.obscpio | 3 --- product-builder-1.0~pre.1503327890.95c265e.obscpio | 3 +++ product-builder.obsinfo | 6 +++--- product-builder.spec | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) delete mode 100644 product-builder-1.0~pre.1503326741.f9c347a.obscpio create mode 100644 product-builder-1.0~pre.1503327890.95c265e.obscpio diff --git a/product-builder-1.0~pre.1503326741.f9c347a.obscpio b/product-builder-1.0~pre.1503326741.f9c347a.obscpio deleted file mode 100644 index 8f833ff..0000000 --- a/product-builder-1.0~pre.1503326741.f9c347a.obscpio +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9c0e32907a186c9e14377790fd6f77735944c60dfc4e696eb3558c26c9842988 -size 1307148 diff --git a/product-builder-1.0~pre.1503327890.95c265e.obscpio b/product-builder-1.0~pre.1503327890.95c265e.obscpio new file mode 100644 index 0000000..5d8c9b4 --- /dev/null +++ b/product-builder-1.0~pre.1503327890.95c265e.obscpio @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7dd36dd7af1a230797a9fd37c80451851c169f2545bd0a657942230a85001dd5 +size 1307148 diff --git a/product-builder.obsinfo b/product-builder.obsinfo index fa2e36c..094eb70 100644 --- a/product-builder.obsinfo +++ b/product-builder.obsinfo @@ -1,5 +1,5 @@ name: product-builder -version: 1.0~pre.1503326741.f9c347a -mtime: 1503326741 -commit: f9c347a8cfc241a72c748d751aec42ed1f246715 +version: 1.0~pre.1503327890.95c265e +mtime: 1503327890 +commit: 95c265e19d66c06f1cbf596b026c4eefc774478b diff --git a/product-builder.spec b/product-builder.spec index 0a802c9..d5c3a0d 100644 --- a/product-builder.spec +++ b/product-builder.spec @@ -23,7 +23,7 @@ Url: http://github.com/openSUSE/product-builder Name: product-builder Conflicts: kiwi Conflicts: kiwi-instsource -Version: 1.0~pre.1503326741.f9c347a +Version: 1.0~pre.1503327890.95c265e Release: 0 Provides: kiwi-schema = 6.2 Source: product-builder-%version.tar.xz From d5588a24dc4e00ca21fcdeea9f6fd32f4ff49c47fabb25e8641731e2eff10628 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Mon, 4 Sep 2017 12:15:42 +0000 Subject: [PATCH 11/14] hack for dominque OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/product-builder?expand=0&rev=35 --- accept_old_meta_package.patch | 12 ++++++++++++ product-builder.spec | 5 +++++ 2 files changed, 17 insertions(+) create mode 100644 accept_old_meta_package.patch diff --git a/accept_old_meta_package.patch b/accept_old_meta_package.patch new file mode 100644 index 0000000..ff108c0 --- /dev/null +++ b/accept_old_meta_package.patch @@ -0,0 +1,12 @@ +diff --git a/modules/KIWICollect.pm b/modules/KIWICollect.pm +index b3e6357..f99ca8b 100644 +--- a/modules/KIWICollect.pm ++++ b/modules/KIWICollect.pm +@@ -1535,6 +1535,7 @@ sub unpackMetapackages { + and defined $this->{m_basesubdir}->{$_} + ) { + qx(cp -a $tmp/CD$_/* $this->{m_basesubdir}->{$_}); ++ $packageFound = 1; + $this->logMsg('W', "Unpack from old legacy /CD$_ directory"); + } elsif ($_ eq 1) { + my $msg; diff --git a/product-builder.spec b/product-builder.spec index d5c3a0d..97779a2 100644 --- a/product-builder.spec +++ b/product-builder.spec @@ -27,6 +27,8 @@ Version: 1.0~pre.1503327890.95c265e Release: 0 Provides: kiwi-schema = 6.2 Source: product-builder-%version.tar.xz +# temporary hack for openSUSE:Factory only +Patch1: accept_old_meta_package.patch Requires: libxslt Requires: perl >= %{perl_version} @@ -60,6 +62,9 @@ and SLE 12. %prep %setup -q +%if %suse_version == "1330" +%patch1 -p1 +%endif %build test -e /.buildenv && . /.buildenv From 044bc1dc9e9245eb9325300101565ba6bc9773bc0ad6a6edaacc57f32d8a67ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Mon, 4 Sep 2017 12:18:21 +0000 Subject: [PATCH 12/14] typo OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/product-builder?expand=0&rev=36 --- product-builder.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/product-builder.spec b/product-builder.spec index 97779a2..4bad233 100644 --- a/product-builder.spec +++ b/product-builder.spec @@ -62,7 +62,7 @@ and SLE 12. %prep %setup -q -%if %suse_version == "1330" +%if 0"%{?suse_version}" == "01330" %patch1 -p1 %endif From 98a45255bccac7f26e58b699532d06623ceb28f4f3d8f05ca6dd6340c55b0f10 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Mon, 4 Sep 2017 12:55:56 +0000 Subject: [PATCH 13/14] hack OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/product-builder?expand=0&rev=37 --- product-builder.spec | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/product-builder.spec b/product-builder.spec index 4bad233..d4b56d3 100644 --- a/product-builder.spec +++ b/product-builder.spec @@ -57,12 +57,11 @@ Requires: syslinux The SUSE product builder, builds product media (CD/DVD) for the SUSE product portfolio. Based on kiwi perl implementation. -To be used only for product medias after openSUSE 13.2, Leap 42 -and SLE 12. +To be used only for product medias for Leap 15 and SLE 15. %prep %setup -q -%if 0"%{?suse_version}" == "01330" +%if 0%{?suse_version} == 1330 %patch1 -p1 %endif From 4e77bc73d95cb577e869afda539a1bd39cdc93b9d65b101eefb5920e8acd61f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Tue, 5 Sep 2017 11:26:27 +0000 Subject: [PATCH 14/14] Accepting request 521076 from home:dimstar:Factory Add changes entry for the patch, so that the bot is happy OBS-URL: https://build.opensuse.org/request/show/521076 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/product-builder?expand=0&rev=38 --- product-builder.changes | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/product-builder.changes b/product-builder.changes index 8dbe756..288e182 100644 --- a/product-builder.changes +++ b/product-builder.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Sep 5 10:04:52 UTC 2017 - adrian@suse.de + +- Add accept_old_meta_package.patch: temporarily accept metadata + in /CD1 for tumbleweed to ease migration. + ------------------------------------------------------------------- Mon Aug 21 14:47:29 UTC 2017 - adrian@suse.de