forge/pmaports
1
0
Fork 0
Code Issues 2 Pull requests Projects Releases Packages Wiki Activity Actions

devicepkg-dev: Make downstreamkernel_prepare callable from any folder

Browse source 
Removes the need to cd $builddir before calling downstreamkernel_prepare
in a kernel APKBUILD prepare function.
This commit is contained in:
Robert Yang 2018-10-10 10:39:15 -04:00 committed by Oliver Smith
parent 2274c1326d
commit da08bebb0b
No known key found for this signature in database
GPG key ID: 5AE7F5513E0885CB
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
main/devicepkg-dev/APKBUILD
View file

@ -1,6 +1,6 @@
pkgname="devicepkg-dev"
pkgver=0.4
pkgrel=0
pkgrel=1
pkgdesc="Provides default device package functions"
url="https://postmarketos.org"
arch="all"
@ -25,4 +25,4 @@ package() {
sha512sums="d69930dd790b00fb39760a37d95a10899f0d167e10e2804feb05d9ce04f94185dc32d36edc90214aba2ea2aa09bf18f7dab93f1d2eff23f67beb2cc83be30e7c compiler-gcc.h
638d50e6388eabf0da6bf0cff2fe9719ad8a808946f0077228db57fa13a26d9eeb39c1f2689c9a6f93ff9b3bcfdcfb7c358b180bba90e5bba8b9a9e78d25ed18 devicepkg_build.sh
c732792596f56860f6ab9ddd53b9a7a80224400dd20097b20cebe17a6e7330e9178783f09db16132a28a555f83e29ef3643bfe069638b62998912a9a7ffefdc0 devicepkg_package.sh
18de8ed6aa8aefea7c40b817023c276c3e63024086cde243c4c4fbe36e42fe51440c21dcded6b4f342054f59046c198d9c9775059b32f8a7cf822793d855ef4d downstreamkernel_prepare.sh"
b04289881f9358cdfb2b1b62909bc828fee25e67082c0496525ba344f402c79b0632248d4980bd0e6b6895f20754fcdd0349a86b4baffcf546a7049e48ea69f3 downstreamkernel_prepare.sh"

6
main/devicepkg-dev/downstreamkernel_prepare.sh
View file

@ -17,8 +17,8 @@ fi
cp -v "/usr/share/devicepkg-dev/compiler-gcc.h" "$builddir/include/linux/"
# Remove -Werror from all makefiles
makefiles="$(find . -type f -name Makefile)
$(find . -type f -name Kbuild)"
makefiles="$(find "$builddir" -type f -name Makefile)
$(find "$builddir" -type f -name Kbuild)"
for i in $makefiles; do
sed -i 's/-Werror-/-W/g' "$i"
sed -i 's/-Werror//g' "$i"
@ -26,4 +26,4 @@ done
# Prepare kernel config ('yes ""' for kernels lacking olddefconfig)
cp "$srcdir/$_config" "$builddir"/.config
yes "" | make ARCH="$_carch" HOSTCC="$HOSTCC" oldconfig
yes "" | make -C "$builddir" ARCH="$_carch" HOSTCC="$HOSTCC" oldconfig