synit
/
pmbootstrap
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #23 from MartijnBraam/device-lg-hammerhead 

Merging upstream for hammerhead
This commit is contained in:
Oliver Smith 2017-06-01 15:37:03 +00:00 committed by GitHub
parent 7cfc680cdf 1bfc068d12
commit 5fab078d5b
14 changed files with 52 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
aports/ccache-cross-symlinks/APKBUILD
View File

@ -7,7 +7,7 @@ pkgrel=2
pkgdesc="Enable ccache for cross-compilers with symlinks"
url="https://ccache.samba.org/"
arch="noarch"
license="GPL3+"
license="MIT"
depends="ccache"
makedepends=""
source=""

2
aports/device-lg-hammerhead/APKBUILD
View File

@ -21,4 +21,4 @@ package() {
"$pkgdir"/etc/deviceinfo
}
sha512sums="5668c5c2d3115e5af7d2e4528f5376d3a6dcdbf3d3c9f8ed36b483cc97300736196f976825ca0a9a2bb4b69cd29a38483142cefd27990f7eae7f34c342877102 deviceinfo"
sha512sums="a12472500d1047361a9b5708e0a1a384e3174717c0844b4e84882de7d65e17ac48a28a5c41d26d0e0f83796a8ceadb2f461a80df94e0fbdad38c6fe9db25c240 deviceinfo"

5
aports/device-lg-hammerhead/deviceinfo
View File

@ -20,8 +20,9 @@ deviceinfo_arch="armhf"
# You can for example extract these from an existing boot.img
deviceinfo_flash_offset_base="0"
deviceinfo_flash_offset_kernel="0x00008000"
deviceinfo_flash_offset_ramdisk="0x02900000"
deviceinfo_flash_offset_second=""
deviceinfo_flash_offset_ramdisk="0x2900000"
deviceinfo_flash_offset_second="0x00f00000"
deviceinfo_flash_offset_tags="0x02700000"
deviceinfo_flash_cmdline="console=ttyHSL0,115200,n8 androidboot.hardware=hammerhead user_debug=31 maxcpus=2 msm_watchdog_v2.enable=1"
deviceinfo_flash_pagesize="2048"

2
aports/device-lg-mako/APKBUILD
View File

@ -4,7 +4,7 @@ pkgrel=2
pkgdesc="Google Nexus 4"
url="https://github.com/postmarketOS"
arch="noarch"
license="FIXME"
license="MIT"
depends="linux-lg-mako"
makedepends=""
install=""

2
aports/device-samsung-i9100/APKBUILD
View File

@ -4,7 +4,7 @@ pkgrel=2
pkgdesc="Samsung Galaxy SII"
url="https://github.com/postmarketOS"
arch="noarch"
license="FIXME"
license="MIT"
depends="linux-samsung-i9100"
makedepends=""
install=""

1
aports/gcc-armhf/APKBUILD
View File

@ -372,6 +372,7 @@ package() {
local gdblib=${_target:+$CTARGET/}lib
mkdir -p "$pkgdir"/usr/share/gdb/python/auto-load/usr/$gdblib
mv "$pkgdir"/usr/$gdblib/*-gdb.py \
"$pkgdir"/usr/share/gdb/python/auto-load/usr/$gdblib/
paxmark -pmrs "$pkgdir"/$_gcclibexec/cc1

2
aports/gcc-cross-wrappers/APKBUILD
View File

@ -4,7 +4,7 @@ pkgrel=1
pkgdesc="GCC wrappers pointing to cross-compilers (for distcc + ccache)"
url="https://github.com/postmarketOS"
arch="noarch"
license="GPL3+"
license="MIT"
depends=""
makedepends=""
source=""

4
aports/linux-lg-hammerhead/APKBUILD
View File

@ -33,6 +33,7 @@ source="
compiler-gcc6.h
aeea3592a13bf12861943e44fc48f1f270941f8d.patch
gpu-msm-fix-gcc5-compile.patch
devtmpfs.patch
"
subpackages=""
license="GPL2"
@ -103,4 +104,5 @@ package() {
sha512sums="882ec7d4ce3eadb372c1279f53fab18c5c7f18109d3df2c8c4005ec5d06e6244c2c788c3183defa4d4aaf493a5c1bf905d8bd2aeb554e4b0680b0e1b45de6742 1dae34efb7d2399073ca371c953aafd2ed503849.zip
d80980e9474c82ba0ef1a6903b434d8bd1b092c40367ba543e72d2c119301c8b2d05265740e4104ca1ac5d15f6c4aa49e8776cb44264a9a28dc551e0d1850dcc compiler-gcc6.h
ea1d3b5a234fa565e3c1a792de48f4fc4e6023d281d303c8e319c7ef28edc5739ab0e4dea0139a41f0a5c7d03e27921ccaa214fd0ac5c72245a094ce60128864 aeea3592a13bf12861943e44fc48f1f270941f8d.patch
7be03a9e78b7ac330a54b1f00509caa0621a95c0c55901878ad757f9dd69cc05ba2c8b5ea987063ae1224f92c4d090d515fa5d369e7755181a4871b0d0f82881 gpu-msm-fix-gcc5-compile.patch"
7be03a9e78b7ac330a54b1f00509caa0621a95c0c55901878ad757f9dd69cc05ba2c8b5ea987063ae1224f92c4d090d515fa5d369e7755181a4871b0d0f82881 gpu-msm-fix-gcc5-compile.patch
71fb635ddac4faee90a2454231e50ac4ba9c273447f3e4c373034e6bce1414fd987bcfc8f7592751debe88230c4e164da7cfe339273510ec3d8f934120ab00f3 devtmpfs.patch"

11
aports/linux-lg-hammerhead/devtmpfs.patch Normal file
View File

@ -0,0 +1,11 @@
diff --git a/arch/arm/configs/hammerhead_defconfig b/arch/arm/configs/hammerhead_defconfig
index f94bb7e..51e5323 100644
--- a/arch/arm/configs/hammerhead_defconfig
+++ b/arch/arm/configs/hammerhead_defconfig
@@ -1,4 +1,5 @@
# CONFIG_ARM_PATCH_PHYS_VIRT is not set
+CONFIG_DEVTMPFS=y
CONFIG_EXPERIMENTAL=y
# CONFIG_SWAP is not set
CONFIG_AUDIT=y

4
aports/linux-lg-mako/APKBUILD
View File

@ -29,7 +29,7 @@ makedepends="perl sed installkernel bash gmp-dev bc linux-headers elfutils-dev"
options="!strip !check !tracedeps"
install=
source="
https://github.com/LineageOS/${_vendor}-kernel-mako/archive/${_hash}.zip
$pkgname-$_hash.zip::https://github.com/LineageOS/${_vendor}-kernel-mako/archive/${_hash}.zip
$_config
compiler-gcc6.h
gpu-msm-fix-gcc5-compile.patch
@ -101,7 +101,7 @@ package() {
"$pkgdir/usr/share/kernel/$_flavor/kernel.release"
}
sha512sums="5a1636374ea0d2b219de5b501035e8b03935c9cf31a5c1aaa831805318d9ff780b0e13f11c73343c63c74a026c4846215ec7954a1b23740bb690b9723d5d9e11 1495bfcf93f9e0e896331f29e1850387c31d6714.zip
sha512sums="5a1636374ea0d2b219de5b501035e8b03935c9cf31a5c1aaa831805318d9ff780b0e13f11c73343c63c74a026c4846215ec7954a1b23740bb690b9723d5d9e11 linux-lg-mako-1495bfcf93f9e0e896331f29e1850387c31d6714.zip
091f0a6d604653098e3d06a834fa3d4a9c34cbdb4b742c949950bada118e58cc858dce817e763023fe7ac5dd7ae17930ef7a3de765e5b7d84b1971572dbf37a1 config-lg-mako.armhf
d80980e9474c82ba0ef1a6903b434d8bd1b092c40367ba543e72d2c119301c8b2d05265740e4104ca1ac5d15f6c4aa49e8776cb44264a9a28dc551e0d1850dcc compiler-gcc6.h
7be03a9e78b7ac330a54b1f00509caa0621a95c0c55901878ad757f9dd69cc05ba2c8b5ea987063ae1224f92c4d090d515fa5d369e7755181a4871b0d0f82881 gpu-msm-fix-gcc5-compile.patch"

4
aports/linux-samsung-i9100/APKBUILD
View File

@ -38,7 +38,7 @@ findutils busybox-static"
options="!strip !check !tracedeps"
install=
source="
https://github.com/LineageOS/android_kernel_samsung_smdk4412/archive/${_hash}.zip
$pkgname-$_hash.zip::https://github.com/LineageOS/android_kernel_samsung_smdk4412/archive/${_hash}.zip
$_config
compiler-gcc6.h
init
@ -125,7 +125,7 @@ package() {
"$pkgdir/usr/share/kernel/$_flavor/kernel.release"
}
sha512sums="28198b1312d66a1af28e112f3252aa9fbbbee8bf373776c556cdbc1c75517072a1eec6522717df0b2bc4f6b5f06b9ce07d2cb29a2de07fc56c4ea072f4d46c82 349a3e91e76d17e67ef6213e1f6712e700695631.zip
sha512sums="28198b1312d66a1af28e112f3252aa9fbbbee8bf373776c556cdbc1c75517072a1eec6522717df0b2bc4f6b5f06b9ce07d2cb29a2de07fc56c4ea072f4d46c82 linux-samsung-i9100-349a3e91e76d17e67ef6213e1f6712e700695631.zip
7ce82e81ca8d472f01f8097e3a434fe0130d66b16b29ed3d4c5ce94870fb4efe3b5e79523802b078fcdc737e5a1ee6351bc8427d1271a098eab8e9f35b95e6b1 config-samsung-i9100.armhf
d80980e9474c82ba0ef1a6903b434d8bd1b092c40367ba543e72d2c119301c8b2d05265740e4104ca1ac5d15f6c4aa49e8776cb44264a9a28dc551e0d1850dcc compiler-gcc6.h
dd4094d5f4ec281d32f12af88cb22a782e497c8e52f69cf60b73ac7d6171fc95f1f8040b3d0ad2ff3f016d22ac1d91c5b522e5d03203534a76742bc55a082af5 init"

21
aports/unpackbootimg/APKBUILD Normal file
View File

@ -0,0 +1,21 @@
pkgname=unpackbootimg
pkgver="14.1"
pkgrel=1
pkgdesc="Android bootimg (zimage + initramfs) extraction tool"
url="https://github.com/LineageOS/android_system_core"
arch="noarch"
license="APACHE2"
depends="python3"
source="$pkgname-$pkgver.py::https://raw.githubusercontent.com/LineageOS/android_system_core/cm-${pkgver}/mkbootimg/${pkgname}"
options="!check"
build() {
cp "$srcdir"/"$pkgname"-"$pkgver".py "$srcdir"/"$pkgname"
sed -i -e 's./usr/bin/env python./usr/bin/env python3.' "$srcdir"/"$pkgname"
}
package() {
install -Dm755 "$srcdir"/"$pkgname" "$pkgdir"/usr/bin/"$pkgname"
}
sha512sums="b86022b3f16a6a35c68a7dd00b0ce2dcac667162f11581090bdb07d50a3ea93a74c2f493405d3d6751d40bf463c022216738ad8bcafc457dfc55e08aa5c2ed0e unpackbootimg-14.1.py"

4
pmb/aportgen/gcc.py
View File

@ -57,10 +57,6 @@ def generate(args, pkgname):
# Do not package libstdc++
'*subpackages="$subpackages libstdc++:libcxx:*':
' subpackages="$subpackages g++$_target:gpp"',
# Do not move gdb.py
'*-gdb.py*': None,
'*/usr/share/gdb/python/auto-load/usr/lib/*': None,
}
pmb.aportgen.core.rewrite(

4
pmb/helpers/run.py
View File

@ -45,6 +45,10 @@ def core(args, cmd, log_message, log, return_stdout, check=True):
except subprocess.CalledProcessError as exc:
if check:
if log:
logging.debug("^" * 70)
logging.info("NOTE: The failed command's output is above"
" the ^^^ line in the logfile: " + args.log)
raise RuntimeError("Command failed: " + log_message) from exc
else:
pass