From c67654d2c24525791be8ccd9112c5273c84eabf343408b5e425c82d44b95cc23 Mon Sep 17 00:00:00 2001 From: Andreas Schwab Date: Mon, 16 Jul 2018 07:57:19 +0000 Subject: [PATCH 1/3] Accepting request 622365 from home:bmwiedemann:branches:Base:System Dont embed build system's kernel version in rpm to make package build reproducible (boo#1101107) (added bug number) OBS-URL: https://build.opensuse.org/request/show/622365 OBS-URL: https://build.opensuse.org/package/show/Base:System/linux-glibc-devel?expand=0&rev=127 --- linux-glibc-devel.changes | 6 ++++++ linux-glibc-devel.spec | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/linux-glibc-devel.changes b/linux-glibc-devel.changes index a7de120..f552062 100644 --- a/linux-glibc-devel.changes +++ b/linux-glibc-devel.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Jul 12 20:25:24 UTC 2018 - bwiedemann@suse.com + +- Dont embed build system's kernel version in rpm + to make package build reproducible (boo#1101107) + ------------------------------------------------------------------- Mon Jun 4 10:18:10 UTC 2018 - schwab@suse.de diff --git a/linux-glibc-devel.spec b/linux-glibc-devel.spec index 4a022af..dcfd4f0 100644 --- a/linux-glibc-devel.spec +++ b/linux-glibc-devel.spec @@ -78,7 +78,7 @@ cat > version.h <<-BOGUS #error "" #error "For the currently running kernel there will be a symbolic " #error "link pointing to the build environment located at " -#error "/lib/modules/$(uname -r)/build for use as ." +#error "/lib/modules/\$(uname -r)/build for use as ." #error "" #error "If you are seeing this message, your environment is " #error "not configured properly. " From 3290b291f6f0d79527f745a53e1a165b35b7b6c2ceaf25b744bf2b97f5d5b9c2 Mon Sep 17 00:00:00 2001 From: Andreas Schwab Date: Mon, 16 Jul 2018 07:58:07 +0000 Subject: [PATCH 2/3] changelog typo OBS-URL: https://build.opensuse.org/package/show/Base:System/linux-glibc-devel?expand=0&rev=128 --- linux-glibc-devel.changes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/linux-glibc-devel.changes b/linux-glibc-devel.changes index f552062..e93a2ec 100644 --- a/linux-glibc-devel.changes +++ b/linux-glibc-devel.changes @@ -1,7 +1,7 @@ ------------------------------------------------------------------- Thu Jul 12 20:25:24 UTC 2018 - bwiedemann@suse.com -- Dont embed build system's kernel version in rpm +- Don't embed build system's kernel version in rpm to make package build reproducible (boo#1101107) ------------------------------------------------------------------- From 15e1531647aba7796b136d5cef76089f4f108c517a64069363c086c405a361bd Mon Sep 17 00:00:00 2001 From: Andreas Schwab Date: Mon, 16 Jul 2018 08:04:29 +0000 Subject: [PATCH 3/3] Accepting request 623063 from home:Andreas_Schwab:Factory - Don't do any expansion on the version.h contents OBS-URL: https://build.opensuse.org/request/show/623063 OBS-URL: https://build.opensuse.org/package/show/Base:System/linux-glibc-devel?expand=0&rev=129 --- linux-glibc-devel.changes | 5 +++++ linux-glibc-devel.spec | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/linux-glibc-devel.changes b/linux-glibc-devel.changes index e93a2ec..c903c84 100644 --- a/linux-glibc-devel.changes +++ b/linux-glibc-devel.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Jul 16 08:00:26 UTC 2018 - schwab@suse.de + +- Don't do any expansion on the version.h contents + ------------------------------------------------------------------- Thu Jul 12 20:25:24 UTC 2018 - bwiedemann@suse.com diff --git a/linux-glibc-devel.spec b/linux-glibc-devel.spec index dcfd4f0..292d961 100644 --- a/linux-glibc-devel.spec +++ b/linux-glibc-devel.spec @@ -51,7 +51,7 @@ packages, instead. %setup -q -n linux-glibc-devel-%{version} %build -cat > version.h <<-BOGUS +cat > version.h <<\BOGUS #ifdef __KERNEL__ #error "=======================================================" #error "You should not include /usr/include/{linux,asm}/ header" @@ -78,7 +78,7 @@ cat > version.h <<-BOGUS #error "" #error "For the currently running kernel there will be a symbolic " #error "link pointing to the build environment located at " -#error "/lib/modules/\$(uname -r)/build for use as ." +#error "/lib/modules/$(uname -r)/build for use as ." #error "" #error "If you are seeing this message, your environment is " #error "not configured properly. " @@ -89,7 +89,7 @@ cat > version.h <<-BOGUS BOGUS # Get LINUX_VERSION_CODE and KERNEL_VERSION directly from kernel cat usr/include/linux/version.h >> version.h -cat >> version.h <<-BOGUS +cat >> version.h <<\BOGUS #endif BOGUS cat version.h