Hello community,
here is the log from the commit of package build for openSUSE:Factory checked
in at 2020-08-31 16:47:36
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/build (Old)
and /work/SRC/openSUSE:Factory/.build.new.3399 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "build"
Mon Aug 31 16:47:36 2020 rev:133 rq:830294 version:20200828
Changes:
--------
--- /work/SRC/openSUSE:Factory/build/build.changes 2020-08-25
09:32:09.927980001 +0200
+++ /work/SRC/openSUSE:Factory/.build.new.3399/build.changes 2020-08-31
16:47:58.828288394 +0200
@@ -1,0 +2,7 @@
+Fri Aug 28 13:48:06 UTC 2020 - Adrian Schröter <adr...@suse.de>
+
+- support rpmlint installed in /usr/bin/ as well
+- fix local build for armv6hl
+- Extract generated chart from the tarball instead of using the recipe
+
+-------------------------------------------------------------------
@@ -31 +38 @@
-- Genreadte .packages and .basepackages files for docker builds
+- Generate .packages and .basepackages files for docker builds
Old:
----
obs-build-20200520.tar.gz
New:
----
obs-build-20200828.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ build.spec ++++++
--- /var/tmp/diff_new_pack.ShfXLV/_old 2020-08-31 16:48:08.508293087 +0200
+++ /var/tmp/diff_new_pack.ShfXLV/_new 2020-08-31 16:48:08.512293089 +0200
@@ -28,7 +28,7 @@
Summary: A Script to Build SUSE Linux RPMs
License: GPL-2.0-only OR GPL-3.0-only
Group: Development/Tools/Building
-Version: 20200520
+Version: 20200828
Release: 0
Source: obs-build-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-build
++++++ PKGBUILD ++++++
--- /var/tmp/diff_new_pack.ShfXLV/_old 2020-08-31 16:48:08.580293122 +0200
+++ /var/tmp/diff_new_pack.ShfXLV/_new 2020-08-31 16:48:08.580293122 +0200
@@ -1,5 +1,5 @@
pkgname=build
-pkgver=20200520
+pkgver=20200828
pkgrel=0
pkgdesc="Build packages in sandbox"
arch=('i686' 'x86_64')
++++++ _service ++++++
--- /var/tmp/diff_new_pack.ShfXLV/_old 2020-08-31 16:48:08.600293132 +0200
+++ /var/tmp/diff_new_pack.ShfXLV/_new 2020-08-31 16:48:08.600293132 +0200
@@ -1,7 +1,7 @@
<services>
<service name="tar_scm" mode="disabled">
- <param name="revision">20200520</param>
- <param name="version">20200520</param>
+ <param name="revision">20200828</param>
+ <param name="version">20200828</param>
<param name="url">git://github.com/openSUSE/obs-build.git</param>
<param name="scm">git</param>
<param name="extract">dist/build.changes</param>
++++++ build.dsc ++++++
--- /var/tmp/diff_new_pack.ShfXLV/_old 2020-08-31 16:48:08.644293153 +0200
+++ /var/tmp/diff_new_pack.ShfXLV/_new 2020-08-31 16:48:08.644293153 +0200
@@ -1,6 +1,6 @@
Format: 1.0
Source: build
-Version: 20200520
+Version: 20200828
Binary: build
Maintainer: Adrian Schroeter <adr...@suse.de>
Architecture: all
++++++ debian.changelog ++++++
--- /var/tmp/diff_new_pack.ShfXLV/_old 2020-08-31 16:48:08.676293169 +0200
+++ /var/tmp/diff_new_pack.ShfXLV/_new 2020-08-31 16:48:08.676293169 +0200
@@ -1,4 +1,4 @@
-build (20200520) unstable; urgency=low
+build (20200828) unstable; urgency=low
* Update to current git trunk
- add sles11sp2 build config and adapt autodetection
++++++ obs-build-20200520.tar.gz -> obs-build-20200828.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/obs-build-20200520/build-recipe-helm
new/obs-build-20200828/build-recipe-helm
--- old/obs-build-20200520/build-recipe-helm 2020-08-20 10:13:26.000000000
+0200
+++ new/obs-build-20200828/build-recipe-helm 2020-08-28 16:28:05.000000000
+0200
@@ -70,12 +70,18 @@
args=()
test -n "$DISTURL" && args=("${args[@]}" --disturl "$DISTURL")
test -n "$RELEASE" && args=("${args[@]}" --release "$RELEASE")
- local nameversion=$(perl -I$BUILD_DIR -MBuild::Helm -e 'Build::Helm::show'
-- "${args[@]}" "$BUILD_ROOT/$TOPDIR/SOURCES/$RECIPEFILE" nameversion)
+ local name=$(perl -I$BUILD_DIR -MBuild::Helm -e 'Build::Helm::show' --
"${args[@]}" "$BUILD_ROOT/$TOPDIR/SOURCES/$RECIPEFILE" name)
+ local version=$(perl -I$BUILD_DIR -MBuild::Helm -e 'Build::Helm::show' --
"${args[@]}" "$BUILD_ROOT/$TOPDIR/SOURCES/$RECIPEFILE" version)
+ local nameversion="$name-$version"
# create chart
chroot $BUILD_ROOT su -c "cd $TOPDIR/BUILD && helm package -d $TOPDIR/HELM
." - $BUILD_USER || cleanup_and_exit 1
test -f "$BUILD_ROOT$TOPDIR/HELM/$nameversion.tgz" || cleanup_and_exit 1
"helm package command did not create $nameversion.tgz"
+ # extract generated Chart.yaml file
+ tar -xOf "$BUILD_ROOT$TOPDIR/HELM/$nameversion.tgz" -- "$name/Chart.yaml"
> "$BUILD_ROOT$TOPDIR/HELM/Chart.yaml"
+ test -s "$BUILD_ROOT$TOPDIR/HELM/Chart.yaml" || cleanup_and_exit 1 "helm
chart does not contain $name/Chart.yaml"
# generate helminfo
- perl -I$BUILD_DIR -MBuild::Helm -e 'Build::Helm::show' -- "${args[@]}"
--chart "$BUILD_ROOT$TOPDIR/HELM/$nameversion.tgz"
"$BUILD_ROOT/$TOPDIR/SOURCES/$RECIPEFILE" helminfo >
"$BUILD_ROOT$TOPDIR/HELM/$nameversion.helminfo"
+ perl -I$BUILD_DIR -MBuild::Helm -e 'Build::Helm::show' -- "${args[@]}"
--chart "$BUILD_ROOT$TOPDIR/HELM/$nameversion.tgz"
"$BUILD_ROOT$TOPDIR/HELM/Chart.yaml" helminfo >
"$BUILD_ROOT$TOPDIR/HELM/$nameversion.helminfo" || cleanup_and_exit 1
+ rm -f "$BUILD_ROOT$TOPDIR/HELM/Chart.yaml"
BUILD_SUCCEEDED=true
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/obs-build-20200520/build-recipe-spec
new/obs-build-20200828/build-recipe-spec
--- old/obs-build-20200520/build-recipe-spec 2020-08-20 10:13:26.000000000
+0200
+++ new/obs-build-20200828/build-recipe-spec 2020-08-28 16:28:05.000000000
+0200
@@ -252,7 +252,14 @@
}
recipe_run_rpmlint() {
- if ! test -x "$BUILD_ROOT/opt/testing/bin/rpmlint" ; then
+ # SUSE builds are using a special rpmlint binary which is not
+ # pulling in additional dependencies
+ local rpmlint="/opt/testing/bin/rpmlint"
+ if ! test -x "$BUILD_ROOT$rpmlint" ; then
+ # default rpmlint place as fallback
+ rpmlint="/usr/bin/rpmlint"
+ fi
+ if ! test -x "$BUILD_ROOT$rpmlint" ; then
return
fi
LINT_RPM_FILE_LIST=($(find $BUILD_ROOT/$TOPDIR/RPMS \
@@ -267,7 +274,7 @@
rpmlint_logfile=$TOPDIR/OTHER/rpmlint.log
rm -f "$BUILD_ROOT$rpmlint_logfile"
ret=0
- chroot $BUILD_ROOT su -s /opt/testing/bin/rpmlint "$BUILD_USER" -- \
+ chroot $BUILD_ROOT su -s $rpmlint "$BUILD_USER" -- \
--info ${LINT_RPM_FILE_LIST[*]#$BUILD_ROOT} \
${SRPM_FILE_LIST[*]#$BUILD_ROOT} > >(tee
"$BUILD_ROOT$rpmlint_logfile") 2>&1 || ret=1
echo
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/obs-build-20200520/common_functions
new/obs-build-20200828/common_functions
--- old/obs-build-20200520/common_functions 2020-08-20 10:13:26.000000000
+0200
+++ new/obs-build-20200828/common_functions 2020-08-28 16:28:05.000000000
+0200
@@ -24,6 +24,7 @@
: ${BUILD_HOST_ARCH:=`uname -m`}
# the linux kernel only knows armv7l, armv7hl is a userland definition
test armv7l == "$BUILD_HOST_ARCH" && BUILD_HOST_ARCH=armv7hl
+ test armv6l == "$BUILD_HOST_ARCH" && BUILD_HOST_ARCH=armv6hl
BUILD_INITVM_ARCH="$BUILD_HOST_ARCH"
# avoid multiple initvm.* helpers for i586 and i686
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/obs-build-20200520/dist/build.changes
new/obs-build-20200828/dist/build.changes
--- old/obs-build-20200520/dist/build.changes 2020-08-20 10:13:26.000000000
+0200
+++ new/obs-build-20200828/dist/build.changes 2020-08-28 16:28:05.000000000
+0200
@@ -1,4 +1,11 @@
-------------------------------------------------------------------
+Fri Aug 28 13:48:06 UTC 2020 - Adrian Schröter <adr...@suse.de>
+
+- support rpmlint installed in /usr/bin/ as well
+- fix local build for armv6hl
+- Extract generated chart from the tarball instead of using the recipe
+
+-------------------------------------------------------------------
Thu Aug 20 08:07:30 UTC 2020 - Adrian Schröter <adr...@suse.de>
- fix factory version in config file bsc#1170956
@@ -28,7 +35,7 @@
- Control disk-space consumption while creating ccache archive
- cleaning ccache
- create folders before trying to copy ccache.tar
-- Genreadte .packages and .basepackages files for docker builds
+- Generate .packages and .basepackages files for docker builds
-------------------------------------------------------------------
Sun May 17 14:32:52 UTC 2020 - co...@suse.com
