Release 620-9; Small fix for when the kernel source package has only two version...

diff --git a/debian/changelog b/debian/changelog
index 80a6f197e7f12a4700f6aebc31332b4b13aaceb3..664fd6a918ec4e4894c618eca91f6ade019d8cf9 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+sasc-ng (620-9) local; urgency=low
+
+  * Fix for building for a kernel that is not currently running 
+
+ -- Jan-Pascal van Best <janpascal@vanbest.org>  Wed, 27 Mar 2013 20:04:55 +0100
+
 sasc-ng (620-8) local; urgency=low
 
   * Build patched dvb-core.ko module from the standard kernel in this package,

diff --git a/debian/rules b/debian/rules
index 1323f4cc5034bc50902e71ee4a9a58aaf0cfe877..91542b7359a3c2a91c79b79d2f451d8e9ecd634c 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -34,6 +34,10 @@ override_dh_auto_clean:
 # build_kernel needs to happen before build_sasc because build_sasc need
 # dvbdev.h which is provided by build_kernel!
 
+define kernel_short_version
+$(shell echo $1|grep -o '[[:digit:]]\+\.[[:digit:]]\+')
+endef
+
 build_sasc_%:
        VERSION="$*"; \
        FLAVOR=$${VERSION#*_}; \
@@ -58,7 +62,7 @@ build_sasc_%:
 build_kernel_%:
        VERSION="$*"; \
        KERNEL=$${VERSION#*_}; \
-       SHORT_KERNEL=$${KERNEL%%-*}; \
+       SHORT_KERNEL=$$( echo $${KERNEL} | grep -o '[[:digit:]]\+\.[[:digit:]]\+' ); \
        KERNEL_TARBALL=/usr/src/linux-source-$${SHORT_KERNEL}.tar.bz2; \
        BUILD_DIR=/lib/modules/$${KERNEL}/build; \
        echo "Building patched dvb-core module for kernel $${KERNEL}"; \
@@ -95,12 +99,7 @@ else
                $(MAKE) -f debian/rules debian/control-real
 endif
 
-define kernel_short_version
-$(shell echo $1|sed -e's/-.*//')
-endef
-
 LINUX_HEADERS    =$(foreach f,$(KERNELS),linux-headers-$(f) (=$(KERNEL_VERSION_$(f)))$(comma))
-#LINUX_SOURCES    =$(foreach f,$(KERNELS),linux-source-$(KERNEL_VERSION_SHORT_$f) (=$(KERNEL_VERSION_$(f)))$(comma))
 LINUX_SOURCES    =$(foreach f,$(KERNELS),linux-source-$(call kernel_short_version,$(f)) (=$(KERNEL_VERSION_$(f)))$(comma))
 
 # call with $1 = kernel version, $2 = full kernel version, $3 = flavor

diff --git a/debian/rules.defs b/debian/rules.defs
index f54e15fa36368800d9bcbbed27f63e910d14eed3..222581aff9a8756cec689047b43fdc9a2e49ae7f 100644 (file)
--- a/debian/rules.defs
+++ b/debian/rules.defs
@@ -1,5 +1,6 @@
 KERNELS = 3.8-trunk-amd64
 KERNEL_VERSION_3.8-trunk-amd64 = 3.8.3-1~experimental.1
+
 FFDECSA_FLAVORS = core2 athlon64 atom corei5
 
 # For the moment we just support amd64