From 214397dc660ef5634b10dd3e69899e719c10cd83 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Thu, 17 Jan 2019 11:53:17 +0000 Subject: [PATCH 1/4] update OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/build?expand=0&rev=371 --- PKGBUILD | 2 +- build.changes | 24 ++++++++++++++++-------- build.dsc | 2 +- build.spec | 8 +++++--- debian.changelog | 2 +- obs-build-20181206.tar.gz | 3 --- obs-build-20190109.tar.gz | 3 +++ 7 files changed, 27 insertions(+), 17 deletions(-) delete mode 100644 obs-build-20181206.tar.gz create mode 100644 obs-build-20190109.tar.gz diff --git a/PKGBUILD b/PKGBUILD index ed24d0e..da3652d 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,5 +1,5 @@ pkgname=build -pkgver=20181206 +pkgver=20190109 pkgrel=0 pkgdesc="Build packages in sandbox" arch=('i686' 'x86_64') diff --git a/build.changes b/build.changes index 995bbf7..1e17a25 100644 --- a/build.changes +++ b/build.changes @@ -1,15 +1,23 @@ ------------------------------------------------------------------- -Thu Dec 6 15:23:11 UTC 2018 - Adrian Schröter +Thu Jan 17 11:02:13 UTC 2019 - Adrian Schröter -- support jumping into KVM debug shells using "--vm-type=kvm --shell" -- adapt to new containerd CLI syntax +- support "--shell" for chroot and KVM builds +- support kvm 3.1 syntax +- Support a ignoreconflicts flag for package expansion +- Tweak log messages +- Fix podman chroot builds +- Squash all layers by default in native docker builds +- Rename vc.1 manpage to buildvc.1 +- support deb query strings in URLs +- detect & support new containerd CLI syntax - Support a new 'UseOBSRepositories' flag -- lxc 3 support -- power9 fixes -- Generate a .milestone artifact for kiwi product builds +- initial openSUSE Leap 15.1 config +- support for LXC version 3 +- milestone handling for kiwi product builds - Support rpm's new '^' separator in version comparison -- Allow to specify extra image repos with -- Rework release handling of containers +- separate cpu flags to extra varaible, set power9 as + compat to power8 for now +- recommend qemu-kvm installation ------------------------------------------------------------------- Mon Nov 26 09:24:17 UTC 2018 - Max Lin diff --git a/build.dsc b/build.dsc index 6245c79..52c5d6a 100644 --- a/build.dsc +++ b/build.dsc @@ -1,6 +1,6 @@ Format: 1.0 Source: build -Version: 20181206 +Version: 20190109 Binary: build Maintainer: Adrian Schroeter Architecture: all diff --git a/build.spec b/build.spec index 3feefc8..e4b147c 100644 --- a/build.spec +++ b/build.spec @@ -1,7 +1,7 @@ # # spec file for package build # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -22,7 +22,7 @@ Name: build Summary: A Script to Build SUSE Linux RPMs License: GPL-2.0-or-later AND GPL-2.0-only Group: Development/Tools/Building -Version: 20181206 +Version: 20190109 Release: 0 Source: obs-build-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -61,6 +61,7 @@ Recommends: perl(YAML) Recommends: perl(YAML::LibYAML) Recommends: bsdtar Recommends: qemu-linux-user +Recommends: /usr/bin/qemu-kvm Recommends: /sbin/mkfs.ext3 %endif @@ -190,6 +191,7 @@ test -e baselibs_global.conf || exit 1 %endif %check +for i in build build-* ; do bash -n $i || exit 1 ; done if [ `whoami` != "root" ]; then echo "WARNING: Not building as root, tests did not run!" exit 0 @@ -230,7 +232,7 @@ sed -i 's,build-mkbaselibs,,' ../configs/*.conf %config(noreplace) /usr/lib/build/emulator/emulator.sh %{_mandir}/man1/build.1* %{_mandir}/man1/unrpm.1* -%{_mandir}/man1/vc.1* +%{_mandir}/man1/buildvc.1* %if 0%{?suse_version} %exclude /usr/lib/build/initvm.* %endif diff --git a/debian.changelog b/debian.changelog index d356f57..a0ac033 100644 --- a/debian.changelog +++ b/debian.changelog @@ -1,4 +1,4 @@ -build (20181206) unstable; urgency=low +build (20190109) unstable; urgency=low * Update to current git trunk - add sles11sp2 build config and adapt autodetection diff --git a/obs-build-20181206.tar.gz b/obs-build-20181206.tar.gz deleted file mode 100644 index eca1ddd..0000000 --- a/obs-build-20181206.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2e37cd9e008b50451751c7aae12083fdf9536ee5a504e6bbad6b0fff25154d8e -size 319133 diff --git a/obs-build-20190109.tar.gz b/obs-build-20190109.tar.gz new file mode 100644 index 0000000..bd23086 --- /dev/null +++ b/obs-build-20190109.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f16290b05449f9e356f264518898d9f58c9101d6401e7f55f4ab145856d4d78a +size 320004 From ef308d1e9a9096b4ee82571b1f4d5c7385ec80a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Mon, 21 Jan 2019 12:01:52 +0000 Subject: [PATCH 2/4] update OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/build?expand=0&rev=372 --- PKGBUILD | 2 +- build.changes | 20 ++------------------ build.dsc | 2 +- build.spec | 2 +- debian.changelog | 2 +- obs-build-20190109.tar.gz | 3 --- obs-build-20190121.tar.gz | 3 +++ 7 files changed, 9 insertions(+), 25 deletions(-) delete mode 100644 obs-build-20190109.tar.gz create mode 100644 obs-build-20190121.tar.gz diff --git a/PKGBUILD b/PKGBUILD index da3652d..3155dff 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,5 +1,5 @@ pkgname=build -pkgver=20190109 +pkgver=20190121 pkgrel=0 pkgdesc="Build packages in sandbox" arch=('i686' 'x86_64') diff --git a/build.changes b/build.changes index 1e17a25..eb42f3b 100644 --- a/build.changes +++ b/build.changes @@ -1,23 +1,7 @@ ------------------------------------------------------------------- -Thu Jan 17 11:02:13 UTC 2019 - Adrian Schröter +Mon Jan 21 12:00:48 UTC 2019 - Adrian Schröter -- support "--shell" for chroot and KVM builds -- support kvm 3.1 syntax -- Support a ignoreconflicts flag for package expansion -- Tweak log messages -- Fix podman chroot builds -- Squash all layers by default in native docker builds -- Rename vc.1 manpage to buildvc.1 -- support deb query strings in URLs -- detect & support new containerd CLI syntax -- Support a new 'UseOBSRepositories' flag -- initial openSUSE Leap 15.1 config -- support for LXC version 3 -- milestone handling for kiwi product builds -- Support rpm's new '^' separator in version comparison -- separate cpu flags to extra varaible, set power9 as - compat to power8 for now -- recommend qemu-kvm installation +- update factory config for libreadline8 switch ------------------------------------------------------------------- Mon Nov 26 09:24:17 UTC 2018 - Max Lin diff --git a/build.dsc b/build.dsc index 52c5d6a..4fa58c0 100644 --- a/build.dsc +++ b/build.dsc @@ -1,6 +1,6 @@ Format: 1.0 Source: build -Version: 20190109 +Version: 20190121 Binary: build Maintainer: Adrian Schroeter Architecture: all diff --git a/build.spec b/build.spec index e4b147c..61f2bb1 100644 --- a/build.spec +++ b/build.spec @@ -22,7 +22,7 @@ Name: build Summary: A Script to Build SUSE Linux RPMs License: GPL-2.0-or-later AND GPL-2.0-only Group: Development/Tools/Building -Version: 20190109 +Version: 20190121 Release: 0 Source: obs-build-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build diff --git a/debian.changelog b/debian.changelog index a0ac033..c0ba2e8 100644 --- a/debian.changelog +++ b/debian.changelog @@ -1,4 +1,4 @@ -build (20190109) unstable; urgency=low +build (20190121) unstable; urgency=low * Update to current git trunk - add sles11sp2 build config and adapt autodetection diff --git a/obs-build-20190109.tar.gz b/obs-build-20190109.tar.gz deleted file mode 100644 index bd23086..0000000 --- a/obs-build-20190109.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f16290b05449f9e356f264518898d9f58c9101d6401e7f55f4ab145856d4d78a -size 320004 diff --git a/obs-build-20190121.tar.gz b/obs-build-20190121.tar.gz new file mode 100644 index 0000000..60c66fa --- /dev/null +++ b/obs-build-20190121.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8fb3622c7c13a65f079a6cf0c37aad605bb0ed143fc68aa13d6b0c52cefaf72a +size 319756 From 6da6595ac97c2c17478a15fe1c5916e16b5bf11f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Mon, 21 Jan 2019 12:27:48 +0000 Subject: [PATCH 3/4] update OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/build?expand=0&rev=373 --- build.changes | 3 +++ obs-build-20190121.tar.gz | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/build.changes b/build.changes index eb42f3b..256206b 100644 --- a/build.changes +++ b/build.changes @@ -2,6 +2,9 @@ Mon Jan 21 12:00:48 UTC 2019 - Adrian Schröter - update factory config for libreadline8 switch +- cleanup 15.1 config with OBS specific stuff + * should not be used for plain build usage + * workarounds for kiwi should be fixed in packages ------------------------------------------------------------------- Mon Nov 26 09:24:17 UTC 2018 - Max Lin diff --git a/obs-build-20190121.tar.gz b/obs-build-20190121.tar.gz index 60c66fa..63b7c48 100644 --- a/obs-build-20190121.tar.gz +++ b/obs-build-20190121.tar.gz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8fb3622c7c13a65f079a6cf0c37aad605bb0ed143fc68aa13d6b0c52cefaf72a -size 319756 +oid sha256:654f704d25e7a83ad50c9ba666277224efec094cb0e280087ed2c1fab87a4a5b +size 320689 From c395ed308c244c69205f59e2c98aa4dd7c3034bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Tue, 22 Jan 2019 10:29:11 +0000 Subject: [PATCH 4/4] update OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/build?expand=0&rev=374 --- PKGBUILD | 2 +- build.changes | 13 +++++++++++++ build.dsc | 2 +- build.spec | 2 +- debian.changelog | 2 +- obs-build-20190121.tar.gz | 3 --- obs-build-20190122.tar.gz | 3 +++ 7 files changed, 20 insertions(+), 7 deletions(-) delete mode 100644 obs-build-20190121.tar.gz create mode 100644 obs-build-20190122.tar.gz diff --git a/PKGBUILD b/PKGBUILD index 3155dff..a686b36 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,5 +1,5 @@ pkgname=build -pkgver=20190121 +pkgver=20190122 pkgrel=0 pkgdesc="Build packages in sandbox" arch=('i686' 'x86_64') diff --git a/build.changes b/build.changes index 256206b..6518394 100644 --- a/build.changes +++ b/build.changes @@ -6,6 +6,19 @@ Mon Jan 21 12:00:48 UTC 2019 - Adrian Schröter * should not be used for plain build usage * workarounds for kiwi should be fixed in packages +------------------------------------------------------------------- +Thu Dec 6 15:23:11 UTC 2018 - Adrian Schröter + +- support jumping into KVM debug shells using "--vm-type=kvm --shell" +- adapt to new containerd CLI syntax +- Support a new 'UseOBSRepositories' flag +- lxc 3 support +- power9 fixes +- Generate a .milestone artifact for kiwi product builds +- Support rpm's new '^' separator in version comparison +- Allow to specify extra image repos with +- Rework release handling of containers + ------------------------------------------------------------------- Mon Nov 26 09:24:17 UTC 2018 - Max Lin diff --git a/build.dsc b/build.dsc index 4fa58c0..ce33091 100644 --- a/build.dsc +++ b/build.dsc @@ -1,6 +1,6 @@ Format: 1.0 Source: build -Version: 20190121 +Version: 20190122 Binary: build Maintainer: Adrian Schroeter Architecture: all diff --git a/build.spec b/build.spec index 61f2bb1..8d1ccca 100644 --- a/build.spec +++ b/build.spec @@ -22,7 +22,7 @@ Name: build Summary: A Script to Build SUSE Linux RPMs License: GPL-2.0-or-later AND GPL-2.0-only Group: Development/Tools/Building -Version: 20190121 +Version: 20190122 Release: 0 Source: obs-build-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build diff --git a/debian.changelog b/debian.changelog index c0ba2e8..01dafb2 100644 --- a/debian.changelog +++ b/debian.changelog @@ -1,4 +1,4 @@ -build (20190121) unstable; urgency=low +build (20190122) unstable; urgency=low * Update to current git trunk - add sles11sp2 build config and adapt autodetection diff --git a/obs-build-20190121.tar.gz b/obs-build-20190121.tar.gz deleted file mode 100644 index 63b7c48..0000000 --- a/obs-build-20190121.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:654f704d25e7a83ad50c9ba666277224efec094cb0e280087ed2c1fab87a4a5b -size 320689 diff --git a/obs-build-20190122.tar.gz b/obs-build-20190122.tar.gz new file mode 100644 index 0000000..2280b0e --- /dev/null +++ b/obs-build-20190122.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fe2694edcf6e77c781c22544a62d707407bc33889ad1ba53123c7039cc44fb96 +size 320953