kernel-snapshot: install fw files into its own subdir, avoids conflicts.

This allows coexistence with the kernel-firmware pkg.

--HG--
extra : convert_revision : dff37d3a5304c5ea4eeaf02c46fa3a18063768d3
This commit is contained in:
Juan RP 2010-02-19 08:47:40 +01:00
parent 9d29d2d001
commit 52a0ddca2c
4 changed files with 22 additions and 3 deletions

View file

@ -0,0 +1 @@
kernel-snapshot

View file

@ -1,10 +1,12 @@
# Template file for 'kernel-firmware'. # Template file for 'kernel-snapshot-firmware'.
# #
short_desc="${pkgname} firmware binary files" short_desc="${pkgname} firmware binary files"
long_desc=" long_desc="
This package contains the binary firmware files required This package contains the binary firmware files required
for some hardware, built from the Linux kernel." for some hardware, built from the Linux kernel."
noarch=yes
do_install() do_install()
{ {
mkdir -p ${DESTDIR}/lib mkdir -p ${DESTDIR}/lib

View file

@ -5,6 +5,8 @@ long_desc="
This package contains the required source headers to be able to build This package contains the required source headers to be able to build
external 3rd party binary modules." external 3rd party binary modules."
revision=1
do_install() do_install()
{ {
mkdir -p ${DESTDIR}/usr mkdir -p ${DESTDIR}/usr

View file

@ -4,6 +4,7 @@
# Override required vars. # Override required vars.
pkgname=kernel-snapshot pkgname=kernel-snapshot
revision=1
_kernel_snapshot=yes _kernel_snapshot=yes
_kernel_ver=2.6.33 _kernel_ver=2.6.33
_kernel_patch_ver=rc8 _kernel_patch_ver=rc8
@ -11,13 +12,26 @@ version=${_kernel_ver}${_kernel_patch_ver}
wrksrc="linux-${_kernel_ver}-${_kernel_patch_ver}" wrksrc="linux-${_kernel_ver}-${_kernel_patch_ver}"
distfiles="${KERNEL_SITE}/kernel/v2.6/testing/linux-${_kernel_ver}-${_kernel_patch_ver}.tar.bz2" distfiles="${KERNEL_SITE}/kernel/v2.6/testing/linux-${_kernel_ver}-${_kernel_patch_ver}.tar.bz2"
checksum=9b5feeb8cf473838d34bd66c6ce9549c654817755559b6a6050d4930cca6d0fc checksum=9b5feeb8cf473838d34bd66c6ce9549c654817755559b6a6050d4930cca6d0fc
subpackages="kernel-firmware $pkgname-headers" subpackages="$pkgname-firmware $pkgname-headers"
# Reset some stuff. # Reset some stuff.
unset build_depends run_depends unset build_depends run_depends
Add_dependency run kernel-firmware ">=2.6.32" Add_dependency run ${pkgname}-firmware ">=${version}"
Add_dependency run initramfs-tools Add_dependency run initramfs-tools
Add_dependency build perl Add_dependency build perl
Add_dependency full coreutils Add_dependency full coreutils
Add_dependency full module-init-tools Add_dependency full module-init-tools
post_install()
{
if [ -n "${revision}" ]; then
lver="${_kernel_ver}-${_kernel_patch_ver}_${revision}"
else
lver="${_kernel_ver}-${_kernel_patch_ver}"
fi
mv ${DESTDIR}/lib/firmware ${DESTDIR}/firmware
mkdir -p ${DESTDIR}/lib/firmware
mv ${DESTDIR}/firmware ${DESTDIR}/lib/firmware/${lver}
}