From 5d41f519094860571bafecdcfba8f7edfdb83992 Mon Sep 17 00:00:00 2001 From: Luca Weiss Date: Mon, 23 Nov 2020 11:35:25 +0100 Subject: [PATCH] linux-t2m-flame: use devicepkg-dev (MR 1751) [ci:ignore-count] [ci:skip-build]: already built successfully in CI --- device/testing/linux-t2m-flame/APKBUILD | 135 +++++------------- .../testing/linux-t2m-flame/compiler-gcc6.h | 69 --------- 2 files changed, 39 insertions(+), 165 deletions(-) delete mode 100644 device/testing/linux-t2m-flame/compiler-gcc6.h diff --git a/device/testing/linux-t2m-flame/APKBUILD b/device/testing/linux-t2m-flame/APKBUILD index 7bd32217d..f77d4c87a 100644 --- a/device/testing/linux-t2m-flame/APKBUILD +++ b/device/testing/linux-t2m-flame/APKBUILD @@ -1,47 +1,17 @@ -# APKBUILD based on linux-vanilla aport. Changes: -# - disabled module installation -# - add !check !tracedeps -# - package: just install zimage and kernel.release, because the kernel config -# does not generate modules or dtb files -# - do not create -dev subpackage (makes no sense without module support) -# +# Reference: # Kernel config based on: arch/arm/configs/msm8610_defconfig -# Changes: -# - enable devtmpfs (needed for udev -> touch support in weston) -# - disable ANDROID_PARANOID_NETWORK (removes network restrictions) -_flavor=t2m-flame -_hash="03396c93577aafae7ca3603de1c74eafd30e7d54" -_config="config-$_flavor.armhf" - -pkgname=linux-$_flavor +pkgname=linux-t2m-flame pkgver=3.4.0 -case $pkgver in - *.*.*) _kernver=${pkgver%.*};; - *.*) _kernver=$pkgver;; -esac -pkgrel=12 +pkgrel=13 +pkgdesc="T2M Flame kernel fork" arch="armhf" -pkgdesc="T2M flame kernel" -url="https://github.com/mozilla-b2g/codeaurora_kernel_msm" -makedepends="dtbtool perl sed installkernel bash gmp-dev bc linux-headers elfutils-dev gcc6" -options="!strip !check !tracedeps pmb:cross-native" -source=" - $pkgname-$_hash.tar.gz::https://github.com/mozilla-b2g/codeaurora_kernel_msm/archive/$_hash.tar.gz - $_config - compiler-gcc6.h - 00_fix_return_address.patch - 02_gpu-msm-fix-gcc5-compile.patch - 03_add-missing-dtbs.patch - 04_fix-fb-imgtype.patch - 05_fix-mdp3-ctrl-off.patch - 06_fix-clock.patch - gcc10-extern_YYLOC_global_declaration.patch -" -license="GPL2" - -_abi_release=$pkgver _carch="arm" +_flavor="t2m-flame" +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 @@ -52,82 +22,55 @@ if [ "${CC:0:5}" != "gcc6-" ]; then CROSS_COMPILE="gcc6-$CROSS_COMPILE" fi -ksrcdir="$srcdir/codeaurora_kernel_msm-$_hash" +# Source +_repository="codeaurora_kernel_msm" +_commit="03396c93577aafae7ca3603de1c74eafd30e7d54" +_config="config-$_flavor.$arch" +source=" + $pkgname-$_commit.tar.gz::https://github.com/mozilla-b2g/$_repository/archive/$_commit.tar.gz + $_config + gcc10-extern_YYLOC_global_declaration.patch + 00_fix_return_address.patch + 02_gpu-msm-fix-gcc5-compile.patch + 03_add-missing-dtbs.patch + 04_fix-fb-imgtype.patch + 05_fix-mdp3-ctrl-off.patch + 06_fix-clock.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}" \ - KBUILD_BUILD_VERSION="$((pkgrel + 1 ))-Alpine" \ + make O="$_outdir" ARCH="$_carch" CC="${CC:-gcc}" \ + KBUILD_BUILD_VERSION="$((pkgrel + 1 ))-postmarketOS" \ CONFIG_NO_ERROR_ON_MISMATCH=y DTC_FLAGS="-p 1024" - - dtbTool -s 2048 -p "scripts/dtc/" -o "arch/arm/boot/dt.img" "arch/arm/boot/" } package() { - cd "$srcdir"/build - unset LDFLAGS + downstreamkernel_package "$builddir" "$pkgdir" "$_carch" "$_flavor" "$_outdir" - make ARCH="$_carch" CC="${CC:-gcc}" \ - KBUILD_BUILD_VERSION="$((pkgrel + 1 ))-Alpine" CONFIG_NO_ERROR_ON_MISMATCH=y \ + unset LDFLAGS + make O="$_outdir" ARCH="$_carch" CC="${CC:-gcc}" \ + KBUILD_BUILD_VERSION="$((pkgrel + 1 ))-postmarketOS" \ INSTALL_MOD_PATH="$pkgdir" firmware_install - mkdir -p "$pkgdir/usr/lib/linux-t2m-flame" - for dtb in $(find "$srcdir/build/arch/arm/boot" -name "*.dtb") - do - install -m644 $dtb "$pkgdir/usr/lib/linux-t2m-flame/" - done - - install -Dm644 "$srcdir/build/arch/arm/boot/dt.img" \ - "$pkgdir/boot/dt.img" - - 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" + # Master DTB (deviceinfo_bootimg_qcdt) + dtbTool -s 2048 -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="f16194d7bf254201290cff2b6eddc8bb8944e28e78d57f64f1feba54be053845873c27b385db286ca50f020102a2bcd5dc53454d5c0526ceb99f970a694f0a17 linux-t2m-flame-03396c93577aafae7ca3603de1c74eafd30e7d54.tar.gz 97b83bd9238a6c00082b794e8ec438621612be7fa489653959751f0785779b225ec849bd604f048d540f34cb5335a2bf0c265b547378638574bbd257874e49f6 config-t2m-flame.armhf -d80980e9474c82ba0ef1a6903b434d8bd1b092c40367ba543e72d2c119301c8b2d05265740e4104ca1ac5d15f6c4aa49e8776cb44264a9a28dc551e0d1850dcc compiler-gcc6.h +2b48f1bf0e3f70703d2cdafc47d5e615cc7c56c70bec56b2e3297d3fa4a7a1321d649a8679614553dde8fe52ff1051dae38d5990e3744c9ca986d92187dcdbeb gcc10-extern_YYLOC_global_declaration.patch ea1d3b5a234fa565e3c1a792de48f4fc4e6023d281d303c8e319c7ef28edc5739ab0e4dea0139a41f0a5c7d03e27921ccaa214fd0ac5c72245a094ce60128864 00_fix_return_address.patch 7be03a9e78b7ac330a54b1f00509caa0621a95c0c55901878ad757f9dd69cc05ba2c8b5ea987063ae1224f92c4d090d515fa5d369e7755181a4871b0d0f82881 02_gpu-msm-fix-gcc5-compile.patch ee53d221cad0970316f16ff52927b9a133a2297b61a61976bd75c07b735b4c87d0a7e6b37d9a849460ec57f6da097801c9ae110b95f33756ca23a148ef86a1d2 03_add-missing-dtbs.patch 8b7615530d6c423ffb1bd3e99a28c045f5586fac9e586dea11d68e5d41dea1b161e2bba915547db94fb1f1fecc2e98c23b3aa7b2736255616440371c827fcab2 04_fix-fb-imgtype.patch f239137a5664515016190effa9f6385b18b599bad48892cb7337723438c0d3d6dc10a719c0733ccb27a93198ceef9daf332146be2e906c591caab92f53869ae4 05_fix-mdp3-ctrl-off.patch -4b0dc5d425c9a6191a8cd3896ffd9adacdb5706a3b31e38f434ec131880fdb75e1717abb54f042c032c512575a1cec2eb63fff9ec87198d2e5f47260f04c721c 06_fix-clock.patch -2b48f1bf0e3f70703d2cdafc47d5e615cc7c56c70bec56b2e3297d3fa4a7a1321d649a8679614553dde8fe52ff1051dae38d5990e3744c9ca986d92187dcdbeb gcc10-extern_YYLOC_global_declaration.patch" +4b0dc5d425c9a6191a8cd3896ffd9adacdb5706a3b31e38f434ec131880fdb75e1717abb54f042c032c512575a1cec2eb63fff9ec87198d2e5f47260f04c721c 06_fix-clock.patch" diff --git a/device/testing/linux-t2m-flame/compiler-gcc6.h b/device/testing/linux-t2m-flame/compiler-gcc6.h deleted file mode 100644 index 844706318..000000000 --- a/device/testing/linux-t2m-flame/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 */ -