update to ubuntu-vivid based kernel (3.19.8)

diff --git a/Makefile b/Makefile
index 5d3f3169ffddd647feb0ccadbc9aa61894bcb50e..d446700a668330853dbbbd3975539f24da9817e5 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,13 +1,12 @@
 RELEASE=4.0
 
-KERNEL_VER=4.0.2
+KERNEL_VER=3.19.8
 PKGREL=1
 # also include firmware of previous versrion into 
 # the fw package:  fwlist-2.6.32-PREV-pve
 KREL=1
 
-KERNELSRCTAR=linux_${KERNEL_VER}.orig.tar.xz
-KERNELDEBTAR=linux_${KERNEL_VER}-1.debian.tar.xz
+KERNELSRCTAR=ubuntu-vivid.tgz
 
 EXTRAVERSION=-${KREL}-pve
 KVNAME=${KERNEL_VER}${EXTRAVERSION}
@@ -19,9 +18,10 @@ GITVERSION:=$(shell cat .git/refs/heads/master)
 
 TOP=$(shell pwd)
 
-KERNEL_SRC=linux-${KERNEL_VER}
+KERNEL_SRC=ubuntu-vivid
 
 KERNEL_CFG_ORG=config-${KERNEL_VER}.org
+#KERNEL_CFG_ORG=${KERNEL_SRC}/debian.master/config/amd64/config.flavour.generic
 
 FW_VER=1.1
 FW_REL=5
@@ -99,9 +99,13 @@ ${PVE_DEB} pve: proxmox-ve/control proxmox-ve/postinst
        gzip --best proxmox-ve/data/usr/share/doc/${PVEPKG}/changelog.Debian
        dpkg-deb --build proxmox-ve/data ${PVE_DEB}
 
+# see https://wiki.ubuntu.com/Kernel/Dev/KernelGitGuide
+# changelog: http://kernel.ubuntu.com/git/ubuntu/ubuntu-vivid.git/log/
 .PHONY: download
 download:
-       fixmestophere
+       rm -rf ubuntu-vivid  ubuntu-vivid.tgz
+       git clone git://kernel.ubuntu.com/ubuntu/ubuntu-vivid.git
+       tar czf ubuntu-vivid.tgz --exclude .git ubuntu-vivid
 
 check_gcc: 
 ifeq    ($(CC), cc)
@@ -169,8 +173,7 @@ PVE_CONFIG_OPTS= \
 -e CONFIG_BLK_DEV_DM \
 -d CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND \
 -e CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE \
---set-val CONFIG_BLK_DEV_LOOP_MIN_COUNT 255 \
--d  CONFIG_MODULE_SIG \
+-d CONFIG_MODULE_SIG \
 -d CONFIG_MEMCG_DISABLED \
 -e CONFIG_MEMCG_SWAP_ENABLED \
 -e CONFIG_MEMCG_KMEM \
@@ -187,9 +190,10 @@ PVE_CONFIG_OPTS= \
        cd ${KERNEL_SRC}; make -j 8
        touch $@
 
-${KERNEL_SRC}/README: ${KERNEL_SRC}.org/README
+${KERNEL_SRC}/README ${KERNEL_CFG_ORG}: ${KERNELSRCTAR} 
        rm -rf ${KERNEL_SRC}
-       cp -a ${KERNEL_SRC}.org ${KERNEL_SRC}
+       tar xf ${KERNELSRCTAR}
+       cat ${KERNEL_SRC}/debian.master/config/config.common.ubuntu ${KERNEL_SRC}/debian.master/config/amd64/config.common.amd64 ${KERNEL_SRC}/debian.master/config/amd64/config.flavour.generic > ${KERNEL_CFG_ORG}
        cd ${KERNEL_SRC}; patch -p1 <../bridge-patch.diff
        #cd ${KERNEL_SRC}; patch -p1 <../bridge-forward-ipv6-neighbor-solicitation.patch
        #cd ${KERNEL_SRC}; patch -p1 <../add-empty-ndo_poll_controller-to-veth.patch
@@ -198,18 +202,6 @@ ${KERNEL_SRC}/README: ${KERNEL_SRC}.org/README
        sed -i ${KERNEL_SRC}/Makefile -e 's/^EXTRAVERSION.*$$/EXTRAVERSION=${EXTRAVERSION}/'
        touch $@
 
-${KERNEL_SRC}.org/README ${KERNEL_CFG_ORG}: ${KERNELSRCTAR} ${KERNELDEBTAR}
-       rm -rf ${KERNEL_SRC}.org ${KERNEL_SRC}.tmp orig
-       mkdir ${KERNEL_SRC}.tmp
-       tar xf ${KERNELDEBTAR} -C ${KERNEL_SRC}.tmp
-       cd ${KERNEL_SRC}.tmp; ./debian/rules orig
-       cd ${KERNEL_SRC}.tmp; ./debian/rules setup
-       cp ${KERNEL_SRC}.tmp/debian/build/build_amd64_none_amd64/.config ${KERNEL_CFG_ORG}
-       rm -rf orig
-       rm -rf ${KERNEL_SRC}.tmp/debian
-       mv ${KERNEL_SRC}.tmp ${KERNEL_SRC}.org
-       touch $@
-
 ${SPL_MODULES}: .compile_mark ${SPLSRC}
        rm -rf ${SPLDIR}
        tar xf ${SPLSRC}

diff --git a/assemble-firmware.pl b/assemble-firmware.pl
index c76e689252986b3b68cc9492c9c9524678567ee6..f0eff1e50812408d727bd01038a9f5fb433f7d0b 100755 (executable)
--- a/assemble-firmware.pl
+++ b/assemble-firmware.pl
@@ -194,6 +194,11 @@ softing-4.6/cansja.bin
 softing-4.6/cancard.bin
 softing-4.6/ldcard.bin
 softing-4.6/bcard.bin 
+wd719x-risc.bin
+wd719x-wcs.bin
+libertas/gspi8385_helper.bin
+wlan/prima/WCNSS_qcom_wlan_nv.bin
+lattice-ecp3.bit
 
 )) {
     $skip->{$fw} = 1;
@@ -270,7 +275,7 @@ while(defined(my $line = <TMP>)) {
     if ($fw =~ m|/|) {
        next if $skip->{$fw};
 
-       die "unable to find firmware: $fw $mod\n";
+        die "unable to find firmware: $fw $mod\n";
     }
 
     my $name = basename($fw);

diff --git a/changelog.Debian b/changelog.Debian
index 6fa096b57d3a76f5e5d344600b86ba4f6192b810..a4c8f447043f8aecf188b844af4f355958458c7e 100644 (file)
--- a/changelog.Debian
+++ b/changelog.Debian
@@ -1,3 +1,9 @@
+pve-kernel-3.19.8 (3.19.8-1) unstable; urgency=medium
+
+  * update to ubuntu-vivid based kernel
+
+ -- Proxmox Support Team <support@proxmox.com>  Wed, 27 May 2015 09:43:40 +0200
+
 pve-kernel-3.10.0 (3.10.0-35) unstable; urgency=medium
 
   * update igb driver to 5.2.18

diff --git a/find-firmware.pl b/find-firmware.pl
index 051210ad097aeffa625d6cf80a7e4b684475469d..fdc82cdcd617c09793d0e0b4e8f7f57c2e084ef7 100755 (executable)
--- a/find-firmware.pl
+++ b/find-firmware.pl
@@ -8,7 +8,7 @@ die "no directory to scan" if !$dir;
 
 die "no such directory" if ! -d $dir;
 
-die "strange directory name" if $dir !~ m|^(.*/)?(4.0.\d+\-\d+\-pve)(/+)?$|;
+die "strange directory name" if $dir !~ m|^(.*/)?(3.19.\d+\-\d+\-pve)(/+)?$|;
 
 my $apiver = $2;
 

diff --git a/linux_4.0.2-1.debian.tar.xz b/linux_4.0.2-1.debian.tar.xz
deleted file mode 100644 (file)
index 30f6932..0000000
Binary files a/linux_4.0.2-1.debian.tar.xz and /dev/null differ

diff --git a/linux_4.0.2.orig.tar.xz b/linux_4.0.2.orig.tar.xz
deleted file mode 100644 (file)
index 91fad26..0000000
Binary files a/linux_4.0.2.orig.tar.xz and /dev/null differ

diff --git a/ubuntu-vivid.tgz b/ubuntu-vivid.tgz
new file mode 100644 (file)
index 0000000..c3afb4e
Binary files /dev/null and b/ubuntu-vivid.tgz differ