From 3bf72cb6ae0e61f7e11b7e605d6f4210d52c23b9 Mon Sep 17 00:00:00 2001 From: Luca Weiss Date: Mon, 16 Nov 2020 12:50:28 +0100 Subject: [PATCH] linux-motorola-titan: use devicepkg-dev (MR 1751) --- device/testing/linux-motorola-titan/APKBUILD | 123 +++++------------- .../linux-motorola-titan/Wno-error.patch | 13 -- .../linux-motorola-titan/compiler-gcc6.h | 69 ---------- 3 files changed, 33 insertions(+), 172 deletions(-) delete mode 100644 device/testing/linux-motorola-titan/Wno-error.patch delete mode 100644 device/testing/linux-motorola-titan/compiler-gcc6.h diff --git a/device/testing/linux-motorola-titan/APKBUILD b/device/testing/linux-motorola-titan/APKBUILD index 0014beff8..3dd97d577 100644 --- a/device/testing/linux-motorola-titan/APKBUILD +++ b/device/testing/linux-motorola-titan/APKBUILD @@ -1,50 +1,17 @@ -# APKBUILD based on linux-vanilla aport. Changes: -# - disabled module installation -# - added !check !tracedeps -# - package: just install zImage-dtb and kernel.release -# - do not create -dev subpackage (makes no sense without module support) -# -# Kernel config changes, based on: arch/arm/configs/titan_defconfig -# Changes: -# - apply patches to compile with gcc6 -# - disable -Werror-implicit-function-declaration and -Wno-error, -# otherwise the kernel would not compile -# - enable devtmpfs (needed for udev -> touch support in weston) -# - disable xz compression -# - mdss: hardcode refresh rate in the video driver -# - disable ANDROID_PARANOID_NETWORK (removes network restrictions) +# Reference: +# Kernel config based on: arch/arm/configs/titan_defconfig -_flavor=motorola-titan -_commit="22bc4ed7f4149f95c84634e6c1baccbbd16c5cc5" -_config="config-$_flavor.armv7" - -pkgname=linux-$_flavor +pkgname=linux-motorola-titan pkgver=3.4.113 -case $pkgver in - *.*.*) _kernver=${pkgver%.*};; - *.*) _kernver=$pkgver;; -esac -pkgrel=13 +pkgrel=14 +pkgdesc="Motorola Moto G 2014 kernel fork" arch="armv7" -pkgdesc="Motorola Moto G 2014 kernel from LineageOS" -url="https://github.com/LineageOS/android_kernel_motorola_msm8226" -makedepends="perl sed installkernel bash gmp-dev bc linux-headers elfutils-dev xz gcc6 dtbtool" -options="!strip !check !tracedeps pmb:cross-native" -source=" - $pkgname-$_commit.tar.gz::https://github.com/LineageOS/android_kernel_motorola_msm8226/archive/$_commit.tar.gz - $_config - compiler-gcc6.h - 00_fix_return_address.patch - 02_mdss_fb_refresh_rate.patch - 06_fix_mdss_fb_rgba_mode.patch - multiple-fixes-gcc-5.patch - Wno-error.patch - gcc10-extern_YYLOC_global_declaration.patch -" -license="GPL-2.0-only" - -_abi_release=$pkgver _carch="arm" +_flavor="motorola-titan" +url="https://kernel.org" +license="GPL-2.0-only" +options="!strip !check !tracedeps pmb:cross-native" +makedepends="bash bc bison devicepkg-dev flex openssl-dev perl dtbtool gcc6" # Compiler: this kernel was only tested with GCC6. Feel free to make a merge # request if you find out that it is booting working with newer GCCs as @@ -55,69 +22,45 @@ if [ "${CC:0:5}" != "gcc6-" ]; then CROSS_COMPILE="gcc6-$CROSS_COMPILE" fi -_ksrcdir="$srcdir/android_kernel_motorola_msm8226-$_commit" +# Source +_repository="android_kernel_motorola_msm8226" +_commit="22bc4ed7f4149f95c84634e6c1baccbbd16c5cc5" +_config="config-$_flavor.$arch" +source=" + $pkgname-$_commit.tar.gz::https://github.com/LineageOS/$_repository/archive/$_commit.tar.gz + $_config + gcc10-extern_YYLOC_global_declaration.patch + 00_fix_return_address.patch + 02_mdss_fb_refresh_rate.patch + 06_fix_mdss_fb_rgba_mode.patch + multiple-fixes-gcc-5.patch +" +builddir="$srcdir/$_repository-$_commit" +_outdir="out" prepare() { - local _patch_failed= - cd "$_ksrcdir" - - # first apply patches in specified order - for i in $source; do - case $i in - *.patch) - msg "Applying $i..." - if ! patch -s -p1 -N -i "$srcdir"/$i; then - echo $i >>failed - _patch_failed=1 - fi - ;; - esac - done - - if ! [ -z "$_patch_failed" ]; then - error "The following patches failed:" - cat failed - return 1 - fi - - # gcc6 support - cp -v "$srcdir/compiler-gcc6.h" "$_ksrcdir/include/linux/" - - mkdir -p "$srcdir"/build - cp "$srcdir"/$_config "$srcdir"/build/.config - make -C "$_ksrcdir" O="$srcdir"/build ARCH="$_carch" HOSTCC="$HOSTCC" \ - silentoldconfig + default_prepare + . downstreamkernel_prepare } build() { - cd "$srcdir"/build unset LDFLAGS - - make ARCH="$_carch" CC="${CC:-gcc}" \ + make O="$_outdir" ARCH="$_carch" CC="${CC:-gcc}" \ KBUILD_BUILD_VERSION="$((pkgrel + 1 ))-postmarketOS" - - # Generate master DTB (deviceinfo_bootimg_qcdt) - dtbTool -s 2048 -p "scripts/dtc/" -o "arch/arm/boot/dt.img" "arch/arm/boot/" } package() { - install -Dm644 "$srcdir/build/arch/arm/boot/zImage" \ - "$pkgdir/boot/vmlinuz-$_flavor" - - install -D "$srcdir/build/include/config/kernel.release" \ - "$pkgdir/usr/share/kernel/$_flavor/kernel.release" + downstreamkernel_package "$builddir" "$pkgdir" "$_carch" "$_flavor" "$_outdir" # Master DTB (deviceinfo_bootimg_qcdt) - install -Dm644 "$srcdir/build/arch/arm/boot/dt.img" \ - "$pkgdir/boot/dt.img" + dtbTool -p scripts/dtc/ -o "$_outdir/arch/$_carch/boot"/dt.img "$_outdir/arch/$_carch/boot/" + install -Dm644 "$_outdir/arch/$_carch/boot"/dt.img "$pkgdir"/boot/dt.img } sha512sums="5e55db19f198fadf0f914c2726c034eeaf9a1f4ad5823a7e8a4e9be2664eb0279c91fb2f1c6a9292be2ac523e367551475ff40569676775a03a709ae50a3d0ec linux-motorola-titan-22bc4ed7f4149f95c84634e6c1baccbbd16c5cc5.tar.gz 778403323f469e4653e9c7694a6acbec969ad1c736d15ffd1ec5ebda8f87655637a79d350c2e4b32883a5f6e9cb2a9f2cdc4490e0cf7ec534ebcbd8eea122763 config-motorola-titan.armv7 -d80980e9474c82ba0ef1a6903b434d8bd1b092c40367ba543e72d2c119301c8b2d05265740e4104ca1ac5d15f6c4aa49e8776cb44264a9a28dc551e0d1850dcc compiler-gcc6.h +2b48f1bf0e3f70703d2cdafc47d5e615cc7c56c70bec56b2e3297d3fa4a7a1321d649a8679614553dde8fe52ff1051dae38d5990e3744c9ca986d92187dcdbeb gcc10-extern_YYLOC_global_declaration.patch ea1d3b5a234fa565e3c1a792de48f4fc4e6023d281d303c8e319c7ef28edc5739ab0e4dea0139a41f0a5c7d03e27921ccaa214fd0ac5c72245a094ce60128864 00_fix_return_address.patch a8c955bf718f155011e980f3d0948be98e1fee5649f418299a4851780543019daf7afa406aa7b0829375645107e4e6fbf241026b0cabe2b2ac895a47df83d2d8 02_mdss_fb_refresh_rate.patch 5f0c30fc48fd0c8f9ca4e3d929dd15e982565e91b2e9e6b81df88c78c7fb646d3e99dfd6c9e02873caa1ca1e9cd6a7c03b97640fb80781cc78f5725122b65507 06_fix_mdss_fb_rgba_mode.patch -4c13711fdcdce3ac0c4d30b79da7a331a9f32d46ad0b9572419b82d58db6eed76f728a340848d66a6378702749c56247439abb26fc1df0d3f5cfd1ef5b53acf9 multiple-fixes-gcc-5.patch -d77966385f1aeb17fad6c3989766e874fea9d5818433d0c92c106dfd9aa3065102f018afb38678b0d741192d9efa4ede0ac4278802bf0878e3dec62dec64f50c Wno-error.patch -2b48f1bf0e3f70703d2cdafc47d5e615cc7c56c70bec56b2e3297d3fa4a7a1321d649a8679614553dde8fe52ff1051dae38d5990e3744c9ca986d92187dcdbeb gcc10-extern_YYLOC_global_declaration.patch" +4c13711fdcdce3ac0c4d30b79da7a331a9f32d46ad0b9572419b82d58db6eed76f728a340848d66a6378702749c56247439abb26fc1df0d3f5cfd1ef5b53acf9 multiple-fixes-gcc-5.patch" diff --git a/device/testing/linux-motorola-titan/Wno-error.patch b/device/testing/linux-motorola-titan/Wno-error.patch deleted file mode 100644 index eeced1238..000000000 --- a/device/testing/linux-motorola-titan/Wno-error.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/Makefile -+++ b/Makefile -@@ -371,9 +371,8 @@ - - KBUILD_CFLAGS := -Wall -Wundef -Wstrict-prototypes -Wno-trigraphs \ - -fno-strict-aliasing -fno-common \ -- -Werror-implicit-function-declaration \ - -Wno-format-security -Wno-sizeof-pointer-memaccess \ -- -fno-delete-null-pointer-checks -Werror -+ -fno-delete-null-pointer-checks - KBUILD_AFLAGS_KERNEL := - KBUILD_CFLAGS_KERNEL := - KBUILD_AFLAGS := -D__ASSEMBLY__ diff --git a/device/testing/linux-motorola-titan/compiler-gcc6.h b/device/testing/linux-motorola-titan/compiler-gcc6.h deleted file mode 100644 index 844706318..000000000 --- a/device/testing/linux-motorola-titan/compiler-gcc6.h +++ /dev/null @@ -1,69 +0,0 @@ -// SOURCE: -// https://github.com/NextThingCo/CHIP-u-boot/issues/10#issuecomment-287515505 - -#ifndef __LINUX_COMPILER_H -#error "Please don't include directly, include instead." -#endif - -#define __used __attribute__((__used__)) -#define __must_check __attribute__((warn_unused_result)) -#define __compiler_offsetof(a, b) __builtin_offsetof(a, b) - -/* Mark functions as cold. gcc will assume any path leading to a call - to them will be unlikely. This means a lot of manual unlikely()s - are unnecessary now for any paths leading to the usual suspects - like BUG(), printk(), panic() etc. [but let's keep them for now for - older compilers] - - Early snapshots of gcc 4.3 don't support this and we can't detect this - in the preprocessor, but we can live with this because they're unreleased. - Maketime probing would be overkill here. - - gcc also has a __attribute__((__hot__)) to move hot functions into - a special section, but I don't see any sense in this right now in - the kernel context */ -#define __cold __attribute__((__cold__)) - -#define __UNIQUE_ID(prefix) __PASTE(__PASTE(__UNIQUE_ID_, prefix), __COUNTER__) - -#ifndef __CHECKER__ -# define __compiletime_warning(message) __attribute__((warning(message))) -# define __compiletime_error(message) __attribute__((error(message))) -#endif /* __CHECKER__ */ - -/* - * Mark a position in code as unreachable. This can be used to - * suppress control flow warnings after asm blocks that transfer - * control elsewhere. - * - * Early snapshots of gcc 4.5 don't support this and we can't detect - * this in the preprocessor, but we can live with this because they're - * unreleased. Really, we need to have autoconf for the kernel. - */ -#define unreachable() __builtin_unreachable() - -/* Mark a function definition as prohibited from being cloned. */ -#define __noclone __attribute__((__noclone__)) - -/* - * Tell the optimizer that something else uses this function or variable. - */ -#define __visible __attribute__((externally_visible)) - -/* - * GCC 'asm goto' miscompiles certain code sequences: - * - * http://gcc.gnu.org/bugzilla/show_bug.cgi?id=58670 - * - * Work it around via a compiler barrier quirk suggested by Jakub Jelinek. - * - * (asm goto is automatically volatile - the naming reflects this.) - */ -#define asm_volatile_goto(x...) do { asm goto(x); asm (""); } while (0) - -#ifdef CONFIG_ARCH_USE_BUILTIN_BSWAP -#define __HAVE_BUILTIN_BSWAP32__ -#define __HAVE_BUILTIN_BSWAP64__ -#define __HAVE_BUILTIN_BSWAP16__ -#endif /* CONFIG_ARCH_USE_BUILTIN_BSWAP */ -