Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichal Marek <mmarek@suse.cz>2014-11-24 15:02:33 +0100
committerMichal Marek <mmarek@suse.cz>2014-11-24 15:04:48 +0100
commit65f7a2551c73185f375bd4f855b40d75e1011471 (patch)
tree8e105e15668831f31ee292668f28f5009037caf7
parent689e44a61528d4dec1f5552e1fd35a530e1f5060 (diff)
Drop the hardcoded kernel release string
The updated kgraft-devel macros set this during build time, so we do not need to know the kernel release string beforehand. As a name suffix for the source packages, let's use SLE12_Test in the master branch and SLE12_Update_<n> in the update branches. Signed-off-by: Michal Marek <mmarek@suse.cz>
-rw-r--r--rpm/kgraft-patch.changes5
-rw-r--r--rpm/kgraft-patch.spec7
-rwxr-xr-xscripts/release-version.sh2
3 files changed, 6 insertions, 8 deletions
diff --git a/rpm/kgraft-patch.changes b/rpm/kgraft-patch.changes
index 14a7d8a..61181a5 100644
--- a/rpm/kgraft-patch.changes
+++ b/rpm/kgraft-patch.changes
@@ -1,4 +1,9 @@
-------------------------------------------------------------------
+Mon Nov 24 14:02:20 UTC 2014 - mmarek@suse.cz
+
+- Drop the hardcoded kernel release string.
+
+-------------------------------------------------------------------
Wed Nov 12 03:10:13 UTC 2014 - mmarek@suse.com
- Mark the module as supported (bnc#904970)
diff --git a/rpm/kgraft-patch.spec b/rpm/kgraft-patch.spec
index 858a96c..fbe471a 100644
--- a/rpm/kgraft-patch.spec
+++ b/rpm/kgraft-patch.spec
@@ -53,13 +53,6 @@ sed -i "s/@@GITREV@@/${commit:0:7}/g" uname_patch/kgr_patch_uname.c
for flavor in %flavors_to_build; do
mkdir -p "obj/$flavor"
cp -r "$@" "obj/$flavor"
- want=@@RELEASE@@
- want=${want//_/.}-$flavor
- have=$(make -sC %{kernel_source $flavor} kernelrelease)
- if test "$want" != "$have"; then
- echo "This package must be built against the $want kernel, have $have" >&2
- exit 1
- fi
make -C %{kernel_source $flavor} M="$PWD/obj/$flavor" modules
done
diff --git a/scripts/release-version.sh b/scripts/release-version.sh
index 5938dde..b499b19 100755
--- a/scripts/release-version.sh
+++ b/scripts/release-version.sh
@@ -1,3 +1,3 @@
#!/bin/bash
-RELEASE=3_12_28-4
+RELEASE=SLE12_Test