From af9df7a7dc720ceaf762e3de1702480cbdc8a62a Mon Sep 17 00:00:00 2001 From: Luca Weiss Date: Mon, 23 Nov 2020 10:08:11 +0100 Subject: [PATCH] linux-samsung-i9300: use devicepkg-dev (MR 1751) --- device/testing/linux-samsung-i9300/APKBUILD | 90 +++++++------------ .../linux-samsung-i9300/compiler-gcc6.h | 69 -------------- 2 files changed, 30 insertions(+), 129 deletions(-) delete mode 100644 device/testing/linux-samsung-i9300/compiler-gcc6.h diff --git a/device/testing/linux-samsung-i9300/APKBUILD b/device/testing/linux-samsung-i9300/APKBUILD index d90a109db..9b6ac4a65 100644 --- a/device/testing/linux-samsung-i9300/APKBUILD +++ b/device/testing/linux-samsung-i9300/APKBUILD @@ -1,42 +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/lineageos_i9305_defconfig -# Changes: -# - enable devtmpfs (needed for udev -> touch support in weston) -# - adding xz to makedepends because of lzma: unrecognized option: 9 (https://wiki.postmarketos.org/wiki/Troubleshooting:kernel) -# - add kernel modules installation -# - disable ANDROID_PARANOID_NETWORK (removes network restrictions) -_flavor=samsung-i9300 -_hash="fa8fa332fdec11744ffe0c742775cc22efe0d041" - -pkgname=linux-$_flavor +pkgname=linux-samsung-i9300 pkgver=3.0.101 -case $pkgver in - *.*.*) _kernver=${pkgver%.*};; - *.*) _kernver=$pkgver;; -esac -pkgrel=1 +pkgrel=2 +pkgdesc="Samsung Galaxy SIII kernel fork" arch="armv7" -_config="config-$_flavor.$arch" -pkgdesc="Samsung Galaxy SIII kernel from LineageOS" -url="https://github.com/LineageOS/android_kernel_samsung_smdk4412" -makedepends="perl sed installkernel bash gmp-dev bc linux-headers elfutils-dev xz busybox-static-$arch gcc6" -options="!strip !check !tracedeps pmb:cross-native" -source=" - $pkgname-$_hash.tar.gz::https://github.com/LineageOS/android_kernel_samsung_smdk4412/archive/$_hash.tar.gz - $_config - compiler-gcc6.h -" -license="GPL2" - -_abi_release=$pkgver _carch="arm" +_flavor="samsung-i9300" +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 xz 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 @@ -47,47 +22,42 @@ if [ "${CC:0:5}" != "gcc6-" ]; then CROSS_COMPILE="gcc6-$CROSS_COMPILE" fi -builddir="$srcdir/android_kernel_samsung_smdk4412-$_hash" +# Source +_repository="android_kernel_samsung_smdk4412" +_commit="fa8fa332fdec11744ffe0c742775cc22efe0d041" +_config="config-$_flavor.$arch" +source=" + $pkgname-$_commit.tar.gz::https://github.com/LineageOS/$_repository/archive/$_commit.tar.gz + $_config +" +builddir="$srcdir/$_repository-$_commit" +_outdir="out" prepare() { default_prepare - - # gcc6 support - cp -v "$srcdir"/compiler-gcc6.h "$builddir"/include/linux/ - cp -v "$srcdir"/$_config .config + . downstreamkernel_prepare } build() { unset LDFLAGS + make O="$_outdir" ARCH="$_carch" CC="${CC:-gcc}" \ + KBUILD_BUILD_VERSION="$((pkgrel + 1 ))-postmarketOS" - echo "-- [ Build kernel ] --" - make ARCH="$_carch" CC="${CC:-gcc}" \ - KBUILD_BUILD_VERSION="$((pkgrel + 1))-postmarketOS" - - echo "-- [ Build modules ] --" # the 'no-pic' flag is necessary to avoid the # error 'Unknown symbol _GLOBAL_OFFSET_TABLE_ (err 0)' when loading the module - make ARCH="$_carch" CC="${CC:-gcc}" CFLAGS_MODULE="-fno-pic" \ - KBUILD_BUILD_VERSION="$((pkgrel + 1))-postmarketOS" CONFIG_NO_ERROR_ON_MISMATCH=y \ - modules + make O="$_outdir" ARCH="$_carch" CC="${CC:-gcc}" \ + KBUILD_BUILD_VERSION="$((pkgrel + 1 ))-postmarketOS" \ + CFLAGS_MODULE="-fno-pic" modules } package() { - echo "--[ Installing kernel ]--" - install -Dm644 "$builddir/arch/arm/boot/zImage" \ - "$pkgdir/boot/vmlinuz-$_flavor" - - install -D "$builddir/include/config/kernel.release" \ - "$pkgdir/usr/share/kernel/$_flavor/kernel.release" + downstreamkernel_package "$builddir" "$pkgdir" "$_carch" "$_flavor" "$_outdir" unset LDFLAGS - - echo "--[ Installing modules ]--" - make ARCH="$_carch" CC="${CC:-gcc}" \ - KBUILD_BUILD_VERSION="$((pkgrel + 1))-postmarketOS" CONFIG_NO_ERROR_ON_MISMATCH=y \ - INSTALL_MOD_PATH="$pkgdir" modules_install + make O="$_outdir" ARCH="$_carch" CC="${CC:-gcc}" \ + KBUILD_BUILD_VERSION="$((pkgrel + 1 ))-postmarketOS" \ + INSTALL_MOD_PATH="$pkgdir" INSTALL_MOD_STRIP=1 modules_install } sha512sums="d87dd54152980b30012fead62e639dde6ff0862d376790eac32800aeffd91482a220c7b1f233933a1879796dcaa3722e86c42a5f0e4df4168ae1f65362952779 linux-samsung-i9300-fa8fa332fdec11744ffe0c742775cc22efe0d041.tar.gz -c1c667ff55603101ae0bb3cfb085a0536a4e817ee9e116b62bead734f758099b1abcbe21c2d8e4790de2a62bd48e3b60ae8e0eb529b829ad71e2ddf1e0296b8d config-samsung-i9300.armv7 -d80980e9474c82ba0ef1a6903b434d8bd1b092c40367ba543e72d2c119301c8b2d05265740e4104ca1ac5d15f6c4aa49e8776cb44264a9a28dc551e0d1850dcc compiler-gcc6.h" +c1c667ff55603101ae0bb3cfb085a0536a4e817ee9e116b62bead734f758099b1abcbe21c2d8e4790de2a62bd48e3b60ae8e0eb529b829ad71e2ddf1e0296b8d config-samsung-i9300.armv7" diff --git a/device/testing/linux-samsung-i9300/compiler-gcc6.h b/device/testing/linux-samsung-i9300/compiler-gcc6.h deleted file mode 100644 index 844706318..000000000 --- a/device/testing/linux-samsung-i9300/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 */ -