Merge remote-tracking branch 'origin/master' into buster-pve-kernel-5.11
This commit is contained in:
commit
09e82a8f66
2
Makefile
2
Makefile
@ -1,7 +1,7 @@
|
|||||||
# also bump pve-kernel-meta if either of MAJ.MIN, PATCHLEVEL or KREL change
|
# also bump pve-kernel-meta if either of MAJ.MIN, PATCHLEVEL or KREL change
|
||||||
KERNEL_MAJ=5
|
KERNEL_MAJ=5
|
||||||
KERNEL_MIN=11
|
KERNEL_MIN=11
|
||||||
KERNEL_PATCHLEVEL=7
|
KERNEL_PATCHLEVEL=17
|
||||||
# increment KREL if the ABI changes (abicheck target in debian/rules)
|
# increment KREL if the ABI changes (abicheck target in debian/rules)
|
||||||
# rebuild packages with new KREL and run 'make abiupdate'
|
# rebuild packages with new KREL and run 'make abiupdate'
|
||||||
KREL=1
|
KREL=1
|
||||||
|
File diff suppressed because it is too large
Load Diff
18
debian/changelog
vendored
18
debian/changelog
vendored
@ -1,3 +1,21 @@
|
|||||||
|
pve-kernel (5.11.17-1~bpo10) buster; urgency=medium
|
||||||
|
|
||||||
|
* backport to Debian Buster based releases
|
||||||
|
|
||||||
|
-- Proxmox Support Team <support@proxmox.com> Wed, 12 May 2021 12:45:37 +0200
|
||||||
|
|
||||||
|
pve-kernel (5.11.17-1) bullseye; urgency=medium
|
||||||
|
|
||||||
|
* update sources to stable release 5.11.17 with Ubuntu-5.11.0-18.19
|
||||||
|
|
||||||
|
-- Proxmox Support Team <support@proxmox.com> Wed, 12 May 2021 12:45:37 +0200
|
||||||
|
|
||||||
|
pve-kernel (5.11.12-1) bullseye; urgency=medium
|
||||||
|
|
||||||
|
* update sources to Ubuntu-5.11.0-14.15
|
||||||
|
|
||||||
|
-- Proxmox Support Team <support@proxmox.com> Fri, 09 Apr 2021 10:31:19 +0200
|
||||||
|
|
||||||
pve-kernel (5.11.7-1~bpo10) pve pmg; urgency=medium
|
pve-kernel (5.11.7-1~bpo10) pve pmg; urgency=medium
|
||||||
|
|
||||||
* backport to Debian Buster based releases
|
* backport to Debian Buster based releases
|
||||||
|
6
debian/rules
vendored
6
debian/rules
vendored
@ -185,7 +185,6 @@ binary: install
|
|||||||
-o -name '*.pl' \
|
-o -name '*.pl' \
|
||||||
\) \
|
\) \
|
||||||
-print | cpio -pd --preserve-modification-time ${BUILD_DIR}/debian/${PVE_HEADER_PKG}/usr/src/linux-headers-${KVNAME}
|
-print | cpio -pd --preserve-modification-time ${BUILD_DIR}/debian/${PVE_HEADER_PKG}/usr/src/linux-headers-${KVNAME}
|
||||||
cd ${KERNEL_SRC_COPY}; cp -a include scripts ${BUILD_DIR}/debian/${PVE_HEADER_PKG}/usr/src/linux-headers-${KVNAME}
|
|
||||||
cd ${KERNEL_SRC_COPY}; \
|
cd ${KERNEL_SRC_COPY}; \
|
||||||
( \
|
( \
|
||||||
find arch/${KERNEL_HEADER_ARCH} -name include -type d -print | \
|
find arch/${KERNEL_HEADER_ARCH} -name include -type d -print | \
|
||||||
@ -199,8 +198,9 @@ binary: install
|
|||||||
rm -rf ${BUILD_DIR}/${KERNEL_SRC_COPY}/${PVE_HEADER_PKG}
|
rm -rf ${BUILD_DIR}/${KERNEL_SRC_COPY}/${PVE_HEADER_PKG}
|
||||||
mkdir -p ${BUILD_DIR}/${KERNEL_SRC_COPY}/${PVE_HEADER_PKG}
|
mkdir -p ${BUILD_DIR}/${KERNEL_SRC_COPY}/${PVE_HEADER_PKG}
|
||||||
cp ${KERNEL_SRC}/.config ${BUILD_DIR}/${KERNEL_SRC_COPY}/${PVE_HEADER_PKG}/.config
|
cp ${KERNEL_SRC}/.config ${BUILD_DIR}/${KERNEL_SRC_COPY}/${PVE_HEADER_PKG}/.config
|
||||||
${MAKE} -C ${KERNEL_SRC_COPY} O=${BUILD_DIR}/${KERNEL_SRC_COPY}/${PVE_HEADER_PKG} -j1 syncconfig prepare scripts
|
${MAKE} -C ${KERNEL_SRC_COPY} O=${BUILD_DIR}/${KERNEL_SRC_COPY}/${PVE_HEADER_PKG} -j1 syncconfig modules_prepare prepare scripts
|
||||||
find ${BUILD_DIR}/${KERNEL_SRC_COPY}/${PVE_HEADER_PKG} -name \*.o.ur-\* | xargs rm -f
|
cd ${KERNEL_SRC_COPY}; cp -a include scripts ${BUILD_DIR}/debian/${PVE_HEADER_PKG}/usr/src/linux-headers-${KVNAME}
|
||||||
|
find ${BUILD_DIR}/${KERNEL_SRC_COPY}/${PVE_HEADER_PKG} -name \*.o.ur-\* -o -name '*.cmd' | xargs rm -f
|
||||||
rsync --ignore-existing -r -v -a $(addprefix ${BUILD_DIR}/${KERNEL_SRC_COPY}/${PVE_HEADER_PKG}/,arch include kernel scripts tools) ${BUILD_DIR}/debian/${PVE_HEADER_PKG}/usr/src/linux-headers-${KVNAME}/
|
rsync --ignore-existing -r -v -a $(addprefix ${BUILD_DIR}/${KERNEL_SRC_COPY}/${PVE_HEADER_PKG}/,arch include kernel scripts tools) ${BUILD_DIR}/debian/${PVE_HEADER_PKG}/usr/src/linux-headers-${KVNAME}/
|
||||||
rm -rf ${BUILD_DIR}/${KERNEL_SRC_COPY}
|
rm -rf ${BUILD_DIR}/${KERNEL_SRC_COPY}
|
||||||
touch $@
|
touch $@
|
||||||
|
@ -1 +1 @@
|
|||||||
Subproject commit e012fdfc5752ed2225e3b47bbbee106f99131458
|
Subproject commit 8c0148239f4cd0bda2bca10770e9bf4ef284b4d2
|
Loading…
Reference in New Issue
Block a user