kernel: generated version is X.Y.Z, use this to simplify.

This commit is contained in:
Juan RP 2011-07-22 12:09:14 +02:00
parent 36e5bf1bf4
commit fd72d01642
2 changed files with 21 additions and 30 deletions

View file

@ -1,13 +1,10 @@
# Common vars shared by the 'kernel' and 'kernel-libc-headers' # Common vars shared by the 'kernel' and 'kernel-libc-headers'
# build templates. # build templates.
version=3.0 _kmajorver=3.0
_kernel_ver_minor=0 version=${_kmajorver}.0
wrksrc="linux-$version" wrksrc="linux-${_kmajorver}"
distfiles="${KERNEL_SITE}/kernel/v3.0/linux-${version}.tar.bz2" distfiles="${KERNEL_SITE}/kernel/v3.0/linux-${_kmajorver}.tar.bz2"
maintainer="Juan RP <xtraeme@gmail.com>" maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://www.kernel.org" homepage="http://www.kernel.org"
license="GPL-2" license="GPL-2"
checksum=64b0228b54ce39b0b2df086109a7b737cde58e3df4f779506ddcaccee90356a0 checksum=64b0228b54ce39b0b2df086109a7b737cde58e3df4f779506ddcaccee90356a0
# Generated kernel version is not the same than in distfile!
_kernel_hooks_version="${version}.${_kernel_ver_minor}"

View file

@ -8,18 +8,18 @@ long_desc="
This package provides the linux kernel image and associated modules." This package provides the linux kernel image and associated modules."
subpackages="kernel-headers" subpackages="kernel-headers"
triggers="kernel-hooks" triggers="kernel-hooks"
nostrip=yes nostrip=yes
noverifyrdeps=yes noverifyrdeps=yes
preserve=yes preserve=yes
revision=1
_kernel_headers_revision=${revision} _kernel_headers_revision=${revision}
if [ -n "${_kernel_ver_minor}" ]; then if [ -n "${_kernel_snapshot}" ]; then
_kernver="${version}.${_kernel_ver_minor}" _kernver="${_kernel_ver}.${_kernel_ver_minor}-${_kernel_patch_ver}"
else else
_kernver="${version}" _kernver="${version}"
fi fi
if [ -n "${_kernel_patch_ver}" ]; then
_kernver="${_kernver}-${_kernel_patch_ver}"
fi
if [ -n "${revision}" ]; then if [ -n "${revision}" ]; then
_kernver="${_kernver}_${revision}" _kernver="${_kernver}_${revision}"
fi fi
@ -67,7 +67,7 @@ do_build()
do_install() do_install()
{ {
local arch lver hdrdest local arch hdrdest
if [ "$xbps_machine" != "x86_64" ]; then if [ "$xbps_machine" != "x86_64" ]; then
arch=i386 arch=i386
@ -78,28 +78,22 @@ do_install()
# Install kernel, firmware and modules # Install kernel, firmware and modules
make INSTALL_MOD_PATH=${DESTDIR} modules_install make INSTALL_MOD_PATH=${DESTDIR} modules_install
if [ -n "${_kernel_snapshot}" ]; then hdrdest=${DESTDIR}/usr/src/kernel-headers-${_kernver}
lver="${_kernver}-${_kernel_patch_ver}"
else
lver="${_kernver}"
fi
hdrdest=${DESTDIR}/usr/src/kernel-headers-${lver} install -Dm644 .config ${DESTDIR}/boot/config-${_kernver}
install -Dm644 arch/x86/boot/bzImage \
install -D -m 644 .config ${DESTDIR}/boot/config-${lver} ${DESTDIR}/boot/vmlinuz-${_kernver}
install -D -m 644 arch/x86/boot/bzImage \ install -Dm644 System.map \
${DESTDIR}/boot/vmlinuz-${lver} ${DESTDIR}/boot/System.map-${_kernver}
install -D -m 644 System.map \ cd ${DESTDIR}/lib/modules/${_kernver} && \
${DESTDIR}/boot/System.map-${lver}
cd ${DESTDIR}/lib/modules/${lver} && \
rm -f source build && \ rm -f source build && \
ln -sf ../../../usr/src/kernel-headers-${lver} build ln -sf ../../../usr/src/kernel-headers-${_kernver} build
cd ${wrksrc} cd ${wrksrc}
# Install required headers to build external modules # Install required headers to build external modules
install -D -m644 Makefile ${hdrdest}/Makefile install -Dm644 Makefile ${hdrdest}/Makefile
install -D -m644 kernel/Makefile ${hdrdest}/kernel/Makefile install -Dm644 kernel/Makefile ${hdrdest}/kernel/Makefile
install -D -m644 .config ${hdrdest}/.config install -Dm644 .config ${hdrdest}/.config
mkdir -p ${hdrdest}/include mkdir -p ${hdrdest}/include
# Remove firmware stuff provided by the "linux-firmware" pkg. # Remove firmware stuff provided by the "linux-firmware" pkg.
rm -rf ${DESTDIR}/lib/firmware rm -rf ${DESTDIR}/lib/firmware