pmb.aportgen.linux: use _outdir for supporting out-of-tree kernel builds (!1893)
Require new pmaports version, which has the related devicepkg-dev changes.
This commit is contained in:
parent
cb9a02b348
commit
364fb333f6
|
@ -13,14 +13,14 @@ def generate_apkbuild(args, pkgname, deviceinfo, patches):
|
||||||
makedepends = "bash bc bison devicepkg-dev flex openssl-dev perl"
|
makedepends = "bash bc bison devicepkg-dev flex openssl-dev perl"
|
||||||
|
|
||||||
package = """
|
package = """
|
||||||
downstreamkernel_package "$builddir" "$pkgdir" "$_carch" "$_flavor\""""
|
downstreamkernel_package "$builddir" "$pkgdir" "$_carch" "$_flavor" "$_outdir\""""
|
||||||
|
|
||||||
if deviceinfo["bootimg_qcdt"] == "true":
|
if deviceinfo["bootimg_qcdt"] == "true":
|
||||||
makedepends += " dtbtool"
|
makedepends += " dtbtool"
|
||||||
|
|
||||||
package += """\n
|
package += """\n
|
||||||
# Master DTB (deviceinfo_bootimg_qcdt)
|
# Master DTB (deviceinfo_bootimg_qcdt)
|
||||||
dtbTool -p scripts/dtc/ -o "arch/$_carch/boot"/dt.img "arch/$_carch/boot/"
|
dtbTool -p scripts/dtc/ -o "$_outdir/arch/$_carch/boot"/dt.img "$_outdir/arch/$_carch/boot/"
|
||||||
install -Dm644 "arch/$_carch/boot"/dt.img "$pkgdir"/boot/dt.img"""
|
install -Dm644 "arch/$_carch/boot"/dt.img "$pkgdir"/boot/dt.img"""
|
||||||
|
|
||||||
content = """\
|
content = """\
|
||||||
|
@ -50,10 +50,11 @@ def generate_apkbuild(args, pkgname, deviceinfo, patches):
|
||||||
$_config""" + ("\n" + " " * 12).join([""] + patches) + """
|
$_config""" + ("\n" + " " * 12).join([""] + patches) + """
|
||||||
"
|
"
|
||||||
builddir="$srcdir/$_repository-$_commit"
|
builddir="$srcdir/$_repository-$_commit"
|
||||||
|
_outdir="out"
|
||||||
|
|
||||||
prepare() {
|
prepare() {
|
||||||
default_prepare
|
default_prepare
|
||||||
downstreamkernel_prepare "$srcdir" "$builddir" "$_config" "$_carch" "$HOSTCC"
|
. downstreamkernel_prepare
|
||||||
}
|
}
|
||||||
|
|
||||||
build() {
|
build() {
|
||||||
|
|
|
@ -24,7 +24,7 @@ apk_keys_path = pmb_src + "/pmb/data/keys"
|
||||||
apk_tools_static_min_version = "2.10.5-r0"
|
apk_tools_static_min_version = "2.10.5-r0"
|
||||||
|
|
||||||
# postmarketOS aports compatibility (checked against "version" in pmaports.cfg)
|
# postmarketOS aports compatibility (checked against "version" in pmaports.cfg)
|
||||||
pmaports_min_version = "5"
|
pmaports_min_version = "6"
|
||||||
|
|
||||||
# Version of the work folder (as asked during 'pmbootstrap init'). Increase
|
# Version of the work folder (as asked during 'pmbootstrap init'). Increase
|
||||||
# this number, whenever migration is required and provide the migration code,
|
# this number, whenever migration is required and provide the migration code,
|
||||||
|
|
Loading…
Reference in New Issue