pool/pesign-obs-integration
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 745580 from home:gary_lin:branches:Base:System

Browse Source 
to keep the files in the OTHER directory (boo#1155474)

OBS-URL: https://build.opensuse.org/request/show/745580
OBS-URL: https://build.opensuse.org/package/show/Base:System/pesign-obs-integration?expand=0&rev=83
This commit is contained in:
Gary Ching-Pang Lin 2019-11-06 06:46:05 +00:00 committed by Git OBS Bridge
parent 06d408973f
commit 61342f2452
3 changed files with 57 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
0001-Keep-the-files-in-the-OTHER-directory.patch Normal file
View File

@ -0,0 +1,49 @@
From dafa41a72190c0fa02afe6acdc06f05eb0eda937 Mon Sep 17 00:00:00 2001
From: Gary Lin <glin@suse.com>
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 <glin@suse.com>
---
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

6
pesign-obs-integration.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Wed Nov 6 03:52:16 UTC 2019 - Gary Ching-Pang Lin <glin@suse.com>
- 0001-Keep-the-files-in-the-OTHER-directory.patch to keep the
files in the OTHER directory (boo#1155474)
-------------------------------------------------------------------
Thu Aug 1 02:41:28 UTC 2019 - Gary Ching-Pang Lin <glin@suse.com>

2
pesign-obs-integration.spec
View File

@ -35,6 +35,7 @@ Source: %{name}_%{version}.tar.gz
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
BuildRoot: %{_tmppath}/%{name}-%{version}-build
# suse-module-tools <= 15.0.10 contains modsign-verify
Requires: suse-module-tools >= 15.0.10
@ -48,6 +49,7 @@ boot loader, kernel and kernel modules in the openSUSE Buildservice.
%patch1 -p1
%patch2 -p1
%patch3 -p1
%patch4 -p1
%build