From cd4d775d3da635a7c65799e1c02f6f712f085fe749361bdaf580d029a748d7e7 Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Mon, 4 Jun 2018 11:22:50 +0000 Subject: [PATCH 01/11] Updating link to change in openSUSE:Factory/product-builder revision 22.0 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/product-builder?expand=0&rev=1fbed940e8ca878d9633f082dc64839b --- _service | 4 ++-- product-builder-1.0.9.obscpio | 3 +++ product-builder-1.1.0.obscpio | 3 --- product-builder.changes | 10 ---------- product-builder.obsinfo | 6 +++--- product-builder.spec | 2 +- 6 files changed, 9 insertions(+), 19 deletions(-) create mode 100644 product-builder-1.0.9.obscpio delete mode 100644 product-builder-1.1.0.obscpio diff --git a/_service b/_service index 27ae014..196ef4f 100644 --- a/_service +++ b/_service @@ -1,8 +1,8 @@ https://github.com/openSUSE/product-builder.git - 1.1.0 - 1.1.0 + 1.0.9 + 1.0.9 git rpm/product-builder.spec diff --git a/product-builder-1.0.9.obscpio b/product-builder-1.0.9.obscpio new file mode 100644 index 0000000..cf3330e --- /dev/null +++ b/product-builder-1.0.9.obscpio @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c7f31b2b1430cda186d890d52d8eca39eb63710cb4448c5aeac2a8ff3b4d118c +size 1310221 diff --git a/product-builder-1.1.0.obscpio b/product-builder-1.1.0.obscpio deleted file mode 100644 index 5a3cf03..0000000 --- a/product-builder-1.1.0.obscpio +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:db36ca6df951003cfe3519844ca4d4aabca7f25d57391ee848fe1619ccb0599b -size 1308685 diff --git a/product-builder.changes b/product-builder.changes index 0f6d8c7..a4d1eeb 100644 --- a/product-builder.changes +++ b/product-builder.changes @@ -1,13 +1,3 @@ -------------------------------------------------------------------- -Tue May 29 15:04:31 UTC 2018 - adrian@suse.de - -- 1.1.0 - * fixed handling of metapackages with multiple lines for one package - filtered via required architecture - * execute mk_listings when configured (bsc#1094929) - + drop promo / live boot code - * Add riscv64 architecture - ------------------------------------------------------------------- Tue Apr 24 16:22:46 UTC 2018 - adrian@suse.de diff --git a/product-builder.obsinfo b/product-builder.obsinfo index beec72a..466b1b9 100644 --- a/product-builder.obsinfo +++ b/product-builder.obsinfo @@ -1,5 +1,5 @@ name: product-builder -version: 1.1.0 -mtime: 1527606165 -commit: 9bdc4b5843aefb749e593a73b6077da1a759e47d +version: 1.0.9 +mtime: 1524586880 +commit: ac313bf62d317dba12acbd1f8446242924dca473 diff --git a/product-builder.spec b/product-builder.spec index 0735729..4449323 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.1.0 +Version: 1.0.9 Release: 0 Provides: kiwi-schema = 6.2 Source: product-builder-%version.tar.xz From a5f9b688934038e2a6e8471d4279a0a35fbc9fd57db4f6a285fe0a7d2713bca2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Mon, 4 Jun 2018 13:36:16 +0000 Subject: [PATCH 02/11] update OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/product-builder?expand=0&rev=80 --- _service | 4 ++-- accept_old_meta_package.patch | 12 ------------ product-builder-1.0.9.obscpio | 3 --- product-builder-1.1.1.obscpio | 3 +++ product-builder.changes | 7 +++++++ product-builder.obsinfo | 6 +++--- product-builder.spec | 10 ++-------- 7 files changed, 17 insertions(+), 28 deletions(-) delete mode 100644 accept_old_meta_package.patch delete mode 100644 product-builder-1.0.9.obscpio create mode 100644 product-builder-1.1.1.obscpio diff --git a/_service b/_service index 196ef4f..4ba5fa5 100644 --- a/_service +++ b/_service @@ -1,8 +1,8 @@ https://github.com/openSUSE/product-builder.git - 1.0.9 - 1.0.9 + 1.1.1 + 1.1.1 git rpm/product-builder.spec diff --git a/accept_old_meta_package.patch b/accept_old_meta_package.patch deleted file mode 100644 index ff108c0..0000000 --- a/accept_old_meta_package.patch +++ /dev/null @@ -1,12 +0,0 @@ -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-1.0.9.obscpio b/product-builder-1.0.9.obscpio deleted file mode 100644 index cf3330e..0000000 --- a/product-builder-1.0.9.obscpio +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c7f31b2b1430cda186d890d52d8eca39eb63710cb4448c5aeac2a8ff3b4d118c -size 1310221 diff --git a/product-builder-1.1.1.obscpio b/product-builder-1.1.1.obscpio new file mode 100644 index 0000000..abee8a6 --- /dev/null +++ b/product-builder-1.1.1.obscpio @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f637570cb58a0b18ebe0682db08a8c283a13cd42bf5528058595b386aac7ddec +size 1308685 diff --git a/product-builder.changes b/product-builder.changes index a4d1eeb..0a36be9 100644 --- a/product-builder.changes +++ b/product-builder.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Jun 4 13:35:16 UTC 2018 - adrian@suse.de + +- 1.1.1 + * fix EFI boot sort order +- drop factory skelcd hack (accept_old_meta_package.patch) + ------------------------------------------------------------------- Tue Apr 24 16:22:46 UTC 2018 - adrian@suse.de diff --git a/product-builder.obsinfo b/product-builder.obsinfo index 466b1b9..4d12cde 100644 --- a/product-builder.obsinfo +++ b/product-builder.obsinfo @@ -1,5 +1,5 @@ name: product-builder -version: 1.0.9 -mtime: 1524586880 -commit: ac313bf62d317dba12acbd1f8446242924dca473 +version: 1.1.1 +mtime: 1528119194 +commit: 0fbfc2134319519da85460f4604eab1ba7a412d8 diff --git a/product-builder.spec b/product-builder.spec index 4449323..df1fccd 100644 --- a/product-builder.spec +++ b/product-builder.spec @@ -23,12 +23,10 @@ Url: http://github.com/openSUSE/product-builder Name: product-builder Conflicts: kiwi Conflicts: kiwi-instsource -Version: 1.0.9 +Version: 1.1.1 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} @@ -61,9 +59,6 @@ To be used only for product medias for Leap 15 and SLE 15. %prep %setup -q -%if 0%{?skelcd_compat} -%patch1 -p1 -%endif %build test -e /.buildenv && . /.buildenv @@ -77,9 +72,8 @@ make buildroot="%{buildroot}" \ ./.version >"%{buildroot}/%{_datadir}/kiwi/.revision" %files -%defattr(-, root, root) %dir %{_datadir}/kiwi -%doc LICENSE +%license LICENSE %{_datadir}/kiwi/.revision %{_datadir}/kiwi/metadata %{_datadir}/kiwi/modules From 49487dfe4caef379830332d244d98983e3ed8f5f70ba7e0ac079bc1c67f80d9a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Mon, 4 Jun 2018 13:37:00 +0000 Subject: [PATCH 03/11] update OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/product-builder?expand=0&rev=81 --- product-builder.changes | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/product-builder.changes b/product-builder.changes index 0a36be9..02b02c3 100644 --- a/product-builder.changes +++ b/product-builder.changes @@ -5,6 +5,13 @@ Mon Jun 4 13:35:16 UTC 2018 - adrian@suse.de * fix EFI boot sort order - drop factory skelcd hack (accept_old_meta_package.patch) +- 1.1.0 + * fixed handling of metapackages with multiple lines for one package + filtered via required architecture + * execute mk_listings when configured (bsc#1094929) + + drop promo / live boot code + * Add riscv64 architecture + ------------------------------------------------------------------- Tue Apr 24 16:22:46 UTC 2018 - adrian@suse.de From 617f8ed36b6b397c6d80026ee8617c5dd2e34fb9dda0429757bb06e3b21ec476 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Mon, 4 Jun 2018 13:37:40 +0000 Subject: [PATCH 04/11] fix OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/product-builder?expand=0&rev=82 --- product-builder.changes | 3 +++ 1 file changed, 3 insertions(+) diff --git a/product-builder.changes b/product-builder.changes index 02b02c3..c3db9d0 100644 --- a/product-builder.changes +++ b/product-builder.changes @@ -5,6 +5,9 @@ Mon Jun 4 13:35:16 UTC 2018 - adrian@suse.de * fix EFI boot sort order - drop factory skelcd hack (accept_old_meta_package.patch) +------------------------------------------------------------------- +Tue May 29 15:04:31 UTC 2018 - adrian@suse.de + - 1.1.0 * fixed handling of metapackages with multiple lines for one package filtered via required architecture From d55587db2c29143b251ad8103a62861e5e26584d97cac46b705323048c057b8b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Tue, 5 Jun 2018 12:46:41 +0000 Subject: [PATCH 05/11] update OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/product-builder?expand=0&rev=83 --- _service | 4 ++-- product-builder.obsinfo | 6 +++--- product-builder.spec | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/_service b/_service index 4ba5fa5..055aab4 100644 --- a/_service +++ b/_service @@ -1,8 +1,8 @@ https://github.com/openSUSE/product-builder.git - 1.1.1 - 1.1.1 + 1.1.2 + 1.1.2 git rpm/product-builder.spec diff --git a/product-builder.obsinfo b/product-builder.obsinfo index 4d12cde..467856c 100644 --- a/product-builder.obsinfo +++ b/product-builder.obsinfo @@ -1,5 +1,5 @@ name: product-builder -version: 1.1.1 -mtime: 1528119194 -commit: 0fbfc2134319519da85460f4604eab1ba7a412d8 +version: 1.1.2 +mtime: 1528127129 +commit: 10132d9270147891adb8bccd7009b132153bdb32 diff --git a/product-builder.spec b/product-builder.spec index df1fccd..bcfe79a 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.1.1 +Version: 1.1.2 Release: 0 Provides: kiwi-schema = 6.2 Source: product-builder-%version.tar.xz From 474c3b454f9eb8992bad27dff27b2f43a7fb2d6f50bb0091b9451cda7106ac0a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Tue, 5 Jun 2018 12:46:49 +0000 Subject: [PATCH 06/11] update OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/product-builder?expand=0&rev=84 --- product-builder-1.1.1.obscpio | 3 --- product-builder-1.1.2.obscpio | 3 +++ 2 files changed, 3 insertions(+), 3 deletions(-) delete mode 100644 product-builder-1.1.1.obscpio create mode 100644 product-builder-1.1.2.obscpio diff --git a/product-builder-1.1.1.obscpio b/product-builder-1.1.1.obscpio deleted file mode 100644 index abee8a6..0000000 --- a/product-builder-1.1.1.obscpio +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f637570cb58a0b18ebe0682db08a8c283a13cd42bf5528058595b386aac7ddec -size 1308685 diff --git a/product-builder-1.1.2.obscpio b/product-builder-1.1.2.obscpio new file mode 100644 index 0000000..b2fe567 --- /dev/null +++ b/product-builder-1.1.2.obscpio @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0c9e2a8af24e8fe87ca74a8a9df36317f23e66904a9461078a095bb56ffaccd1 +size 1309197 From 7fd1c1b543766554f609fb592f56c5b82b543dd6bfcf21a2f8e39c7d36e34508 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Tue, 5 Jun 2018 12:47:18 +0000 Subject: [PATCH 07/11] changes OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/product-builder?expand=0&rev=85 --- product-builder.changes | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/product-builder.changes b/product-builder.changes index c3db9d0..1f1a608 100644 --- a/product-builder.changes +++ b/product-builder.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Jun 5 12:46:51 UTC 2018 - adrian@suse.de + +- 1.1.2 + * Do not generate Apple partion on ppc64le anymore + ------------------------------------------------------------------- Mon Jun 4 13:35:16 UTC 2018 - adrian@suse.de From f3e9c0f5aec6f7f5d043f95e7e41dc33ab0a3d308defb26a3c5aeca7c7970be4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Tue, 5 Jun 2018 14:35:16 +0000 Subject: [PATCH 08/11] update OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/product-builder?expand=0&rev=86 --- product-builder-1.1.2.obscpio | 2 +- product-builder.changes | 1 + product-builder.obsinfo | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/product-builder-1.1.2.obscpio b/product-builder-1.1.2.obscpio index b2fe567..3bd05c2 100644 --- a/product-builder-1.1.2.obscpio +++ b/product-builder-1.1.2.obscpio @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0c9e2a8af24e8fe87ca74a8a9df36317f23e66904a9461078a095bb56ffaccd1 +oid sha256:17087d085d5094511839d30d44899ce54781765487c46deaee4e7ee818ecae03 size 1309197 diff --git a/product-builder.changes b/product-builder.changes index 1f1a608..8db7ed2 100644 --- a/product-builder.changes +++ b/product-builder.changes @@ -3,6 +3,7 @@ Tue Jun 5 12:46:51 UTC 2018 - adrian@suse.de - 1.1.2 * Do not generate Apple partion on ppc64le anymore + * Allow to build medias without meta packages again ------------------------------------------------------------------- Mon Jun 4 13:35:16 UTC 2018 - adrian@suse.de diff --git a/product-builder.obsinfo b/product-builder.obsinfo index 467856c..c305a67 100644 --- a/product-builder.obsinfo +++ b/product-builder.obsinfo @@ -1,5 +1,5 @@ name: product-builder version: 1.1.2 -mtime: 1528127129 -commit: 10132d9270147891adb8bccd7009b132153bdb32 +mtime: 1528209169 +commit: a312874d8d4001a16ca44c4c60eda4345ec68c60 From 707ba97905756f6a04b661b44dc3e0f02975c9aeb314edb5accaa1081f1c7906 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Tue, 5 Jun 2018 14:48:35 +0000 Subject: [PATCH 09/11] update OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/product-builder?expand=0&rev=87 --- product-builder-1.1.2.obscpio | 4 ++-- product-builder.obsinfo | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/product-builder-1.1.2.obscpio b/product-builder-1.1.2.obscpio index 3bd05c2..54a351e 100644 --- a/product-builder-1.1.2.obscpio +++ b/product-builder-1.1.2.obscpio @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:17087d085d5094511839d30d44899ce54781765487c46deaee4e7ee818ecae03 -size 1309197 +oid sha256:ece6dd32eb393e7a0991b6a2656817093ec602f05ea60b49f3be922ab6c94844 +size 1308685 diff --git a/product-builder.obsinfo b/product-builder.obsinfo index c305a67..24f6031 100644 --- a/product-builder.obsinfo +++ b/product-builder.obsinfo @@ -1,5 +1,5 @@ name: product-builder version: 1.1.2 -mtime: 1528209169 -commit: a312874d8d4001a16ca44c4c60eda4345ec68c60 +mtime: 1528210069 +commit: 1ea727f2f4a8177f4ed36273de1a553ff2351b9f From bb65ef0a190929a77a568d149f710fc8378a6d58a3b3a87abcf6e92f26a1231c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Wed, 6 Jun 2018 08:55:03 +0000 Subject: [PATCH 10/11] update OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/product-builder?expand=0&rev=88 --- _service | 4 ++-- product-builder-1.1.2.obscpio | 3 --- product-builder-1.1.3.obscpio | 3 +++ product-builder.obsinfo | 6 +++--- product-builder.spec | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) delete mode 100644 product-builder-1.1.2.obscpio create mode 100644 product-builder-1.1.3.obscpio diff --git a/_service b/_service index 055aab4..ee25dc1 100644 --- a/_service +++ b/_service @@ -1,8 +1,8 @@ https://github.com/openSUSE/product-builder.git - 1.1.2 - 1.1.2 + 1.1.3 + 1.1.3 git rpm/product-builder.spec diff --git a/product-builder-1.1.2.obscpio b/product-builder-1.1.2.obscpio deleted file mode 100644 index 54a351e..0000000 --- a/product-builder-1.1.2.obscpio +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ece6dd32eb393e7a0991b6a2656817093ec602f05ea60b49f3be922ab6c94844 -size 1308685 diff --git a/product-builder-1.1.3.obscpio b/product-builder-1.1.3.obscpio new file mode 100644 index 0000000..1b41e82 --- /dev/null +++ b/product-builder-1.1.3.obscpio @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:207ef68109d8158e2e3599afe553ce4bd35f73a6dfa053d342d7585a78e9e59b +size 1309197 diff --git a/product-builder.obsinfo b/product-builder.obsinfo index 24f6031..646fb5e 100644 --- a/product-builder.obsinfo +++ b/product-builder.obsinfo @@ -1,5 +1,5 @@ name: product-builder -version: 1.1.2 -mtime: 1528210069 -commit: 1ea727f2f4a8177f4ed36273de1a553ff2351b9f +version: 1.1.3 +mtime: 1528275159 +commit: 717e1875568f05082a116dc015563f7bde4ec255 diff --git a/product-builder.spec b/product-builder.spec index bcfe79a..ed9b519 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.1.2 +Version: 1.1.3 Release: 0 Provides: kiwi-schema = 6.2 Source: product-builder-%version.tar.xz From be47481b12d7f58062f4ae8b9751beb3131a96d5b18fe8c81b499b16822a9bbb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Wed, 6 Jun 2018 08:57:35 +0000 Subject: [PATCH 11/11] fix OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/product-builder?expand=0&rev=89 --- product-builder.changes | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/product-builder.changes b/product-builder.changes index 8db7ed2..994de5a 100644 --- a/product-builder.changes +++ b/product-builder.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Jun 6 08:57:09 UTC 2018 - adrian@suse.de + +- 1.1.3 + * Another fix needed for hybrid media on x86_64 + ------------------------------------------------------------------- Tue Jun 5 12:46:51 UTC 2018 - adrian@suse.de