Hello community,
here is the log from the commit of package pesign-obs-integration for
openSUSE:Factory checked in at 2019-11-11 12:58:46
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/pesign-obs-integration (Old)
and /work/SRC/openSUSE:Factory/.pesign-obs-integration.new.2990 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "pesign-obs-integration"
Mon Nov 11 12:58:46 2019 rev:36 rq:746111 version:10.1
Changes:
--------
---
/work/SRC/openSUSE:Factory/pesign-obs-integration/pesign-obs-integration.changes
2019-09-05 12:46:57.935467479 +0200
+++
/work/SRC/openSUSE:Factory/.pesign-obs-integration.new.2990/pesign-obs-integration.changes
2019-11-11 12:58:50.881592317 +0100
@@ -1,0 +2,12 @@
+Wed Nov 6 09:58:34 UTC 2019 - Jiri Slaby <[email protected]>
+
+- 0001-brp-99-compress-vmlinux-support-xz-compressed-vmlinu.patch
+ to support xz-compressed vmlinux (bnc#1155921)
+
+-------------------------------------------------------------------
+Wed Nov 6 03:52:16 UTC 2019 - Gary Ching-Pang Lin <[email protected]>
+
+- 0001-Keep-the-files-in-the-OTHER-directory.patch to keep the
+ files in the OTHER directory (boo#1155474)
+
+-------------------------------------------------------------------
New:
----
0001-Keep-the-files-in-the-OTHER-directory.patch
0001-brp-99-compress-vmlinux-support-xz-compressed-vmlinu.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ pesign-obs-integration.spec ++++++
--- /var/tmp/diff_new_pack.O6OHQR/_old 2019-11-11 12:58:51.501592975 +0100
+++ /var/tmp/diff_new_pack.O6OHQR/_new 2019-11-11 12:58:51.501592975 +0100
@@ -35,6 +35,8 @@
Patch1: 0001-Passthrough-license-tag.patch
Patch2: 0001-Add-support-for-kernel-module-compression.patch
Patch3: 0001-Initialize-compress-variable.patch
+Patch4: 0001-Keep-the-files-in-the-OTHER-directory.patch
+Patch5: 0001-brp-99-compress-vmlinux-support-xz-compressed-vmlinu.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
# suse-module-tools <= 15.0.10 contains modsign-verify
Requires: suse-module-tools >= 15.0.10
@@ -48,6 +50,8 @@
%patch1 -p1
%patch2 -p1
%patch3 -p1
+%patch4 -p1
+%patch5 -p1
%build
++++++ 0001-Keep-the-files-in-the-OTHER-directory.patch ++++++
>From dafa41a72190c0fa02afe6acdc06f05eb0eda937 Mon Sep 17 00:00:00 2001
From: Gary Lin <[email protected]>
Date: Wed, 6 Nov 2019 11:43:44 +0800
Subject: [PATCH] Keep the files in the OTHER directory
We currently only kept the "*.log" files for the repackaging while there
are some use cases that the user might need other types of files.
Update pesign-repackage.spec.in to filter out the meta and internal files
and keep the files in the OTHER directory.
Bugzilla entry:
OBS do not export some files to API OTHER on x86_64
https://bugzilla.suse.com/show_bug.cgi?id=1155474
Signed-off-by: Gary Lin <[email protected]>
---
pesign-repackage.spec.in | 14 +++++++++++---
1 file changed, 11 insertions(+), 3 deletions(-)
diff --git a/pesign-repackage.spec.in b/pesign-repackage.spec.in
index ca8d325..1679878 100644
--- a/pesign-repackage.spec.in
+++ b/pesign-repackage.spec.in
@@ -84,10 +84,18 @@ for rpm in %_sourcedir/*.rpm; do
rpms=("${rpms[@]}" "$rpm")
done
popd
-for log in %_sourcedir/*.log; do
- if test -e "$log"; then
+# Copy files other than the meta files and RPMs to %_topdir/OTHER
+OTHER_FILES=`find %_sourcedir/ -maxdepth 1 -type f \
+ -not -regex '.*\.\(rpm\|spec\|rsasign\|sig\|crt\)' \
+ -not -name "_buildenv" \
+ -not -name "_statistics" \
+ -not -name "logfile" \
+ -not -name "meta" \
+ -print`
+for file in $OTHER_FILES; do
+ if test -e "$file"; then
mkdir -p "%_topdir/OTHER"
- cp "$log" "$_"
+ cp "$file" "$_"
fi
done
mkdir rsasigned
--
2.23.0
++++++ 0001-brp-99-compress-vmlinux-support-xz-compressed-vmlinu.patch ++++++
From: Jiri Slaby <[email protected]>
Date: Wed, 6 Nov 2019 10:57:01 +0100
Subject: brp-99-compress-vmlinux: support xz-compressed vmlinux
Patch-mainline: submitted as PR#16
References: bnc#1155921
Signed-off-by: Jiri Slaby <[email protected]>
---
brp-99-compress-vmlinux | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/brp-99-compress-vmlinux b/brp-99-compress-vmlinux
index 2c8222d23024..ffe3841fb836 100755
--- a/brp-99-compress-vmlinux
+++ b/brp-99-compress-vmlinux
@@ -11,11 +11,13 @@ kernel-*)
exit 0
esac
for f in $RPM_BUILD_ROOT/boot/vmlinux-*; do
- if test -e "$f" -a -e "$f.gz"; then
- echo "gzip $f"
- # Deliberately not using gzip -n; the vmlinux image has a
- # predictable timestamp (bnc#880848#c20)
- gzip -k -9 -f "$f"
- fi
+ for compression in gz/gzip xz; do
+ if test -e "$f" -a -e "$f.${compression%/*}"; then
+ echo "${compression#*/} $f"
+ # Deliberately not using -n; the vmlinux image has a
+ # predictable timestamp (bnc#880848#c20)
+ ${compression#*/} -k -9 -f "$f"
+ fi
+ done
done
--
2.24.0
