From 83f291916a84f22ce71323ae1b8f49b496909c77 Mon Sep 17 00:00:00 2001 From: OBS User adrianSuSE Date: Thu, 25 Nov 2021 13:07:22 +0000 Subject: [PATCH] update Rev openSUSE:Tools/440 Md5 e8bcc85b160229c0317fccae214f0c8b 2021-11-25 13:07:22 adrianSuSE None --- PKGBUILD | 2 +- _service | 4 ++-- build.changes | 16 ++++++++++++++++ build.dsc | 2 +- build.spec | 7 +++++-- debian.changelog | 2 +- obs-build-20211025.tar.gz | 3 --- obs-build-20211125.tar.gz | 3 +++ 8 files changed, 29 insertions(+), 10 deletions(-) delete mode 100644 obs-build-20211025.tar.gz create mode 100644 obs-build-20211125.tar.gz diff --git a/PKGBUILD b/PKGBUILD index 51c9e750..98fc0597 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,5 +1,5 @@ pkgname=build -pkgver=20211025 +pkgver=20211125 pkgrel=0 pkgdesc="Build packages in sandbox" arch=('i686' 'x86_64') diff --git a/_service b/_service index e4679e49..76795b71 100644 --- a/_service +++ b/_service @@ -1,7 +1,7 @@ - 20211025 - 20211025 + 20211125 + 20211125 git://github.com/openSUSE/obs-build.git git dist/build.changes diff --git a/build.changes b/build.changes index 936e5c8d..3089c170 100644 --- a/build.changes +++ b/build.changes @@ -1,3 +1,19 @@ +------------------------------------------------------------------- +Thu Nov 25 13:01:00 UTC 2021 - Adrian Schröter + +- renamed tumbleweed config to tumbleweed +- synced tumbleweed config changes +- initial config for Leap 15.4 +- docker build environment + * Use /.dockerenv as marker for docker environment + * support privileged docker/nspawn mode + * move --cap-add=SYS_ADMIN --cap-add=MKNOD to privileged mode + * initvm: do not attempt to mount /proc and binfmt_misc handler if present +- pbuild + * rename --hide-timestamps to --no-timestamps + * reuse options from older builds + * revised --single build mode + ------------------------------------------------------------------- Mon Oct 25 09:16:20 UTC 2021 - Adrian Schröter diff --git a/build.dsc b/build.dsc index ebc8c230..46b736d5 100644 --- a/build.dsc +++ b/build.dsc @@ -1,6 +1,6 @@ Format: 1.0 Source: build -Version: 20211025 +Version: 20211125 Binary: build Maintainer: Adrian Schroeter Architecture: all diff --git a/build.spec b/build.spec index f2100ff3..a316dbd6 100644 --- a/build.spec +++ b/build.spec @@ -28,7 +28,7 @@ Name: %{__pkg_name} Summary: A Script to Build SUSE Linux RPMs License: GPL-2.0-only OR GPL-3.0-only Group: Development/Tools/Building -Version: 20211025 +Version: 20211125 Release: 0 Source: obs-build-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -177,10 +177,13 @@ ln -s sl42.${SLE_V:3:1}.conf default.conf # this is SUSE Leap 15 and higher ln -s sl${SLE_V:0:2}.${SLE_V:3:1}.conf default.conf %endif -%if !0%{?sle_version} && ( 0%{?suse_version} <= 1310 || 0%{?suse_version} == 1320 || 0%{?suse_version} == 1330 || 0%{?suse_version} == 1550 ) +%if !0%{?sle_version} && ( 0%{?suse_version} <= 1310 || 0%{?suse_version} == 1320 || 0%{?suse_version} == 1330 ) # this is old openSUSE releases and Factory ln -s sl${SUSE_V:0:2}.${SUSE_V:2:1}.conf default.conf %endif +%if !0%{?sle_version} && ( 0%{?suse_version} == 1599 ) +ln -s tumbleweed.conf default.conf +%endif %if 0%{?sle_version} && !0%{?is_opensuse} # this is SUSE SLE 12 and higher ln -s sle${SLE_V:0:2}.${SLE_V:3:1}.conf default.conf diff --git a/debian.changelog b/debian.changelog index b1c0a8dd..1b82416c 100644 --- a/debian.changelog +++ b/debian.changelog @@ -1,4 +1,4 @@ -build (20211025) unstable; urgency=low +build (20211125) unstable; urgency=low * Update to current git trunk - add sles11sp2 build config and adapt autodetection diff --git a/obs-build-20211025.tar.gz b/obs-build-20211025.tar.gz deleted file mode 100644 index e4fccc1f..00000000 --- a/obs-build-20211025.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e4fbd47674046157656d7fc95eb0d8fc3fe28047e3f245001eb3839af51ca086 -size 511118 diff --git a/obs-build-20211125.tar.gz b/obs-build-20211125.tar.gz new file mode 100644 index 00000000..25c87a22 --- /dev/null +++ b/obs-build-20211125.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1d8e6402a9e00a0f72212144c59692ca152ecaed883557cbab56b97630417daa +size 536293