RELEASE=3.1
KERNEL_VER=3.10.0
-PKGREL=1
+PKGREL=3
# also include firmware of previous versrion into
# the fw package: fwlist-2.6.32-PREV-pve
KREL=1
KERNEL_CFG_ORG=${RHKERSRCDIR}/kernel-${KERNEL_VER}-x86_64.config
-FW_VER=1.0
-FW_REL=23
+FW_VER=1.1
+FW_REL=1
FW_DEB=pve-firmware_${FW_VER}-${FW_REL}_all.deb
#AOEDIR=aoe6-77
PVEPKG=proxmox-ve-${KERNEL_VER}
PVE_DEB=${PVEPKG}_${RELEASE}-${PKGREL}_all.deb
-all: check_gcc ${DST_DEB}
-#${PVE_DEB} ${FW_DEB} ${HDR_DEB}
-
-${PVE_DEB} pve: proxmox-ve/control proxmox-ve/postinst
- rm -rf proxmox-ve/data
- mkdir -p proxmox-ve/data/DEBIAN
- mkdir -p proxmox-ve/data/usr/share/doc/${PVEPKG}/
- install -m 0644 proxmox-ve/proxmox-release\@proxmox.com.pubkey proxmox-ve/data/usr/share/doc/${PVEPKG}
- sed -e 's/@KVNAME@/${KVNAME}/' -e 's/@KERNEL_VER@/${KERNEL_VER}/' -e 's/@RELEASE@/${RELEASE}/' -e 's/@PKGREL@/${PKGREL}/' <proxmox-ve/control >proxmox-ve/data/DEBIAN/control
- sed -e 's/@KERNEL_VER@/${KERNEL_VER}/' <proxmox-ve/postinst >proxmox-ve/data/DEBIAN/postinst
- chmod 0755 proxmox-ve/data/DEBIAN/postinst
- echo "git clone git://git.proxmox.com/git/pve-kernel-2.6.32.git\\ngit checkout ${GITVERSION}" > proxmox-ve/data/usr/share/doc/${PVEPKG}/SOURCE
- install -m 0644 proxmox-ve/copyright proxmox-ve/data/usr/share/doc/${PVEPKG}
- install -m 0644 proxmox-ve/changelog.Debian proxmox-ve/data/usr/share/doc/${PVEPKG}
- gzip --best proxmox-ve/data/usr/share/doc/${PVEPKG}/changelog.Debian
- dpkg-deb --build proxmox-ve/data ${PVE_DEB}
+all: check_gcc ${DST_DEB} ${FW_DEB} ${HDR_DEB}
check_gcc:
gcc --version|grep "4.7.2" || false
${KERNEL_CFG}: ${KERNEL_CFG_ORG} config-${KERNEL_VER}.diff
cp ${KERNEL_CFG_ORG} ${KERNEL_CFG}.new
- #patch --no-backup ${KERNEL_CFG}.new config-${KERNEL_VER}.diff
+ patch --no-backup ${KERNEL_CFG}.new config-${KERNEL_VER}.diff
mv ${KERNEL_CFG}.new ${KERNEL_CFG}
${KERNEL_SRC}/README: ${KERNEL_SRC}.org/README
rm -rf ${KERNEL_SRC}
cp -a ${KERNEL_SRC}.org ${KERNEL_SRC}
+ cd ${KERNEL_SRC}; patch -p1 <../net-core-always-propagate-flag-changes.patch
#cd ${KERNEL_SRC}; patch -p1 <../bootsplash-3.8.diff
#cd ${KERNEL_SRC}; patch -p1 <../${RHKERSRCDIR}/patch-042stab083
#cd ${KERNEL_SRC}; patch -p1 <../do-not-use-barrier-on-ext3.patch
chmod 0755 $(headers_tmp)/DEBIAN/postinst
install -D -m 644 copyright $(headers_tmp)/usr/share/doc/${HDRPACKAGE}/copyright
install -D -m 644 changelog.Debian $(headers_tmp)/usr/share/doc/${HDRPACKAGE}/changelog.Debian
- echo "git clone git://git.proxmox.com/git/pve-kernel-2.6.32.git\\ngit checkout ${GITVERSION}" > $(headers_tmp)/usr/share/doc/${HDRPACKAGE}/SOURCE
+ echo "git clone git://git.proxmox.com/git/pve-kernel-3.10.0.git\\ngit checkout ${GITVERSION}" > $(headers_tmp)/usr/share/doc/${HDRPACKAGE}/SOURCE
gzip -f --best $(headers_tmp)/usr/share/doc/${HDRPACKAGE}/changelog.Debian
install -m 0644 ${KERNEL_SRC}/.config $(headers_dir)
install -m 0644 ${KERNEL_SRC}/Module.symvers $(headers_dir)
dpkg-deb --build $(headers_tmp) ${HDR_DEB}
#lintian ${HDR_DEB}
+dvb-firmware.git/README:
+ git clone https://github.com/OpenELEC/dvb-firmware.git dvb-firmware.git
+
linux-firmware.git/WHENCE:
git clone git://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git linux-firmware.git
-${FW_DEB} fw: control.firmware linux-firmware.git/WHENCE changelog.firmware fwlist-2.6.18-2-pve fwlist-2.6.24-12-pve fwlist-2.6.32-3-pve fwlist-2.6.32-4-pve fwlist-2.6.32-5-pve fwlist-2.6.32-6-pve fwlist-2.6.35-1-pve fwlist-2.6.32-13-pve fwlist-2.6.32-14-pve fwlist-2.6.32-15-pve fwlist-2.6.32-20-pve fwlist-${KVNAME}
+${FW_DEB} fw: control.firmware linux-firmware.git/WHENCE dvb-firmware.git/README changelog.firmware fwlist-2.6.18-2-pve fwlist-2.6.24-12-pve fwlist-2.6.32-3-pve fwlist-2.6.32-4-pve fwlist-2.6.32-6-pve fwlist-2.6.35-1-pve fwlist-2.6.32-13-pve fwlist-2.6.32-14-pve fwlist-2.6.32-20-pve fwlist-${KVNAME}
rm -rf fwdata
mkdir -p fwdata/lib/firmware
./assemble-firmware.pl fwlist-${KVNAME} fwdata/lib/firmware
./assemble-firmware.pl fwlist-2.6.18-2-pve fwdata/lib/firmware
./assemble-firmware.pl fwlist-2.6.32-3-pve fwdata/lib/firmware
./assemble-firmware.pl fwlist-2.6.32-4-pve fwdata/lib/firmware
- ./assemble-firmware.pl fwlist-2.6.32-5-pve fwdata/lib/firmware
./assemble-firmware.pl fwlist-2.6.32-6-pve fwdata/lib/firmware
./assemble-firmware.pl fwlist-2.6.35-1-pve fwdata/lib/firmware
./assemble-firmware.pl fwlist-2.6.32-13-pve fwdata/lib/firmware
./assemble-firmware.pl fwlist-2.6.32-14-pve fwdata/lib/firmware
- ./assemble-firmware.pl fwlist-2.6.32-15-pve fwdata/lib/firmware
- ./assemble-firmware.pl fwlist-2.6.32-16-pve fwdata/lib/firmware
./assemble-firmware.pl fwlist-2.6.32-20-pve fwdata/lib/firmware
install -d fwdata/usr/share/doc/pve-firmware
cp linux-firmware.git/WHENCE fwdata/usr/share/doc/pve-firmware/README
dpkg-deb --build fwdata ${FW_DEB}
.PHONY: upload
-upload: ${DST_DEB} # ${PVE_DEB} ${HDR_DEB} ${FW_DEB}
+upload: ${DST_DEB} ${HDR_DEB} ${FW_DEB}
umount /pve/${RELEASE}; mount /pve/${RELEASE} -o rw
mkdir -p /pve/${RELEASE}/extra
mkdir -p /pve/${RELEASE}/install
rm -rf /pve/${RELEASE}/extra/${PACKAGE}_*.deb
rm -rf /pve/${RELEASE}/extra/${HDRPACKAGE}_*.deb
- rm -rf /pve/${RELEASE}/extra/${PVEPKG}_*.deb
-# rm -rf /pve/${RELEASE}/extra/pve-firmware*.deb
+ rm -rf /pve/${RELEASE}/extra/pve-firmware*.deb
rm -rf /pve/${RELEASE}/extra/Packages*
-# cp ${DST_DEB} ${PVE_DEB} ${HDR_DEB} ${FW_DEB} /pve/${RELEASE}/extra
- cp ${DST_DEB} /pve/${RELEASE}/extra
+ cp ${DST_DEB} ${FW_DEB} ${HDR_DEB} /pve/${RELEASE}/extra
cd /pve/${RELEASE}/extra; dpkg-scanpackages . /dev/null | gzip -9c > Packages.gz
umount /pve/${RELEASE}; mount /pve/${RELEASE} -o ro
.PHONY: distclean
distclean: clean
- rm -rf linux-firmware.git linux-firmware-from-kernel.git ${KERNEL_SRC}.org ${RHKERSRCDIR}
+ rm -rf linux-firmware.git dvb-firmware.git ${KERNEL_SRC}.org ${RHKERSRCDIR}
.PHONY: clean
clean: