From 20ff145695ea1e6ab61fc15e358ee777a263a7049cbdcc4ee4ceba3bcab45eba Mon Sep 17 00:00:00 2001 From: Ruediger Oertel Date: Wed, 9 Aug 2017 09:31:03 +0000 Subject: [PATCH] - 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