Package: oss4-dkms
Version: 4.2-build2007-2
Followup-For: Bug #713841
Hello,
following patch should fix the issue.
Only tested dkms.
Thanks
Michal
-- System Information:
Debian Release: 7.2
APT prefers testing
APT policy: (990, 'testing'), (990, 'stable'), (171, 'unstable'), (151,
'experimental'), (121, 'precise-updates'), (121, 'precise-security'), (121,
'precise'), (101, 'stable'), (101, 'oldstable')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 3.7.1-amd64 (SMP w/2 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Versions of packages oss4-dkms depends on:
ii dkms 2.2.0.3-1.2
ii dpkg-dev 1.16.12
ii linux-headers-3.11-trunk-amd64 [linux-headers] 3.11-1~exp1
ii linux-headers-3.2.0-24 [linux-headers] 3.2.0-24.39
ii linux-headers-3.2.0-4-amd64 [linux-headers] 3.2.51-1
ii linux-headers-3.7.1-amd64 [linux-headers] 1
ii linux-headers-amd64 [linux-headers] 3.2+46
ii oss4-base 4.2-build2006-2+deb7u1
oss4-dkms recommends no packages.
oss4-dkms suggests no packages.
-- no debconf information
diff -urx series oss4-4.2-build2007/debian/m-a/rules oss4-4.2-build2007-2+l310/debian/m-a/rules
--- oss4-4.2-build2007/debian/m-a/rules 2012-11-19 18:53:17.000000000 +0100
+++ oss4-4.2-build2007-2+l310/debian/m-a/rules 2013-10-20 19:20:09.000000000 +0200
@@ -44,10 +44,10 @@
dh_installdirs lib/modules/$(KVERS)/kernel/oss4
# This is Bad(tm) but necessary since linux-headers >= 2.6.29
- test ! -e /lib/modules/$(KVERS)/build/include/linux/limits.h || \
- cp /lib/modules/$(KVERS)/build/include/linux/limits.h $(PWD)/core
- test ! -e /lib/modules/$(KVERS)/source/include/linux/limits.h || \
- cp /lib/modules/$(KVERS)/source/include/linux/limits.h $(PWD)/core
+ for i in /lib/modules/$(KVERS)/build/include/linux/limits.h /lib/modules/$(KVERS)/source/include/linux/limits.h \
+ /lib/modules/$(KVERS)/build/include/uapi/linux/limits.h /lib/modules/$(KVERS)/source/include/uapi/linux/limits.h ; do \
+ test -e $$i && cp -v $$i $(PWD)/core && break ; done ||:
+ test -e $(PWD)/core/limits.h
# Build the modules
$(MAKE) -C $(KSRC) M=$(PWD)/core modules
diff -urx series oss4-4.2-build2007/debian/oss4-dkms.dkms.in oss4-4.2-build2007-2+l310/debian/oss4-dkms.dkms.in
--- oss4-4.2-build2007/debian/oss4-dkms.dkms.in 2012-11-19 19:09:42.000000000 +0100
+++ oss4-4.2-build2007-2+l310/debian/oss4-dkms.dkms.in 2013-10-20 19:14:37.000000000 +0200
@@ -97,8 +97,11 @@
DEST_MODULE_LOCATION[30]="/updates/dkms/"
DEST_MODULE_LOCATION[31]="/updates/dkms/"
AUTOINSTALL=yes
-MAKE[0]="test ! -e /lib/modules/${kernelver}/build/include/linux/limits.h || cp /lib/modules/${kernelver}/build/include/linux/limits.h ${dkms_tree}/${PACKAGE_NAME}/${PACKAGE_VERSION}/build/core ; \
- test ! -e /lib/modules/${kernelver}/source/include/linux/limits.h || cp /lib/modules/${kernelver}/source/include/linux/limits.h ${dkms_tree}/${PACKAGE_NAME}/${PACKAGE_VERSION}/build/core ; \
+MAKE[0]="test -e /lib/modules/${kernelver}/build/include/linux/limits.h && cp -v /lib/modules/${kernelver}/build/include/linux/limits.h ${dkms_tree}/${PACKAGE_NAME}/${PACKAGE_VERSION}/build/core ; \
+ test -e /lib/modules/${kernelver}/build/include/uapi/linux/limits.h && cp -v /lib/modules/${kernelver}/build/include/uapi/linux/limits.h ${dkms_tree}/${PACKAGE_NAME}/${PACKAGE_VERSION}/build/core ; \
+ test -e /lib/modules/${kernelver}/source/include/linux/limits.h && cp -v /lib/modules/${kernelver}/source/include/linux/limits.h ${dkms_tree}/${PACKAGE_NAME}/${PACKAGE_VERSION}/build/core ; \
+ test -e /lib/modules/${kernelver}/source/include/uapi/linux/limits.h && cp -v /lib/modules/${kernelver}/source/include/uapi/linux/limits.h ${dkms_tree}/${PACKAGE_NAME}/${PACKAGE_VERSION}/build/core ; \
+ test -e ${dkms_tree}/${PACKAGE_NAME}/${PACKAGE_VERSION}/build/core/limits.h && \
make -C ${kernel_source_dir} SUBDIRS=${dkms_tree}/${PACKAGE_NAME}/${PACKAGE_VERSION}/build/core modules && \
make -C ${dkms_tree}/${PACKAGE_NAME}/${PACKAGE_VERSION}/build/drivers osscore_symbols.inc && \
make -C ${kernel_source_dir} SUBDIRS=${dkms_tree}/${PACKAGE_NAME}/${PACKAGE_VERSION}/build/drivers modules"
