Merge pull request #200 from teg/master

core/linux-raspberrypi: Prepare kernel for /lib -> /usr/lib move
This commit is contained in:
Kevin Mihelich 2012-07-16 08:57:48 -07:00
commit 2c59735af5

View file

@ -60,6 +60,9 @@ build() {
# set extraversion to pkgrel
sed -ri "s|^(EXTRAVERSION =).*|\1 -${pkgrel}|" Makefile
# don't run depmod on 'make install'. We'll do this ourselves in packaging
sed -i '2iexit 0' scripts/depmod.sh
# get kernel version
make prepare
@ -129,6 +132,12 @@ package_linux-raspberrypi() {
# add real version for building modules and running depmod from post_install/upgrade
mkdir -p "${pkgdir}/lib/modules/extramodules-${pkgver}-${_kernelname:-ARCH}"
echo "${_kernver}" > "${pkgdir}/lib/modules/extramodules-${pkgver}-${_kernelname:-ARCH}/version"
# move module tree /lib -> /usr/lib
mv "$pkgdir/lib" "$pkgdir/usr"
# Now we call depmod...
depmod -b "$pkgdir" -F System.map "$_kernver"
}
package_linux-headers-raspberrypi() {
@ -137,10 +146,10 @@ package_linux-headers-raspberrypi() {
conflicts=('kernel26-headers')
replaces=('kernel26-headers')
mkdir -p "${pkgdir}/lib/modules/${_kernver}"
install -dm755 "${pkgdir}/usr/lib/modules/${_kernver}"
cd "${pkgdir}/lib/modules/${_kernver}"
ln -sf ../../../usr/src/linux-${_kernver} build
cd "${pkgdir}/usr/lib/modules/${_kernver}"
ln -sf ../../../src/linux-${_kernver} build
cd "${srcdir}/linux"
install -D -m644 Makefile \