device/linux-amazon-thor: modernize APKBUILD (#1553)
This commit is contained in:
steamport
Oliver Smith
parent
4451373be6
commit
5daf8e2648
13
device/linux-amazon-thor/00_fix_qaudio.patch
Normal file
13
device/linux-amazon-thor/00_fix_qaudio.patch
Normal file
@ -0,0 +1,13 @@
|
||||
diff --git a/sound/soc/msm/qdsp6v2/rtac.c b/sound/soc/msm/qdsp6v2/rtac.c
|
||||
index 6009af82407..e36aa02fad1 100644
|
||||
--- a/sound/soc/msm/qdsp6v2/rtac.c
|
||||
+++ b/sound/soc/msm/qdsp6v2/rtac.c
|
||||
@@ -26,7 +26,7 @@
|
||||
#include <sound/q6afe-v2.h>
|
||||
#include <sound/q6audio-v2.h>
|
||||
#include <sound/apr_audio-v2.h>
|
||||
-#include <q6voice.h>
|
||||
+#include "q6voice.h"
|
||||
#include "audio_acdb.h"
|
||||
|
||||
|
||||
13
device/linux-amazon-thor/00_fix_smd_private.patch
Normal file
13
device/linux-amazon-thor/00_fix_smd_private.patch
Normal file
@ -0,0 +1,13 @@
|
||||
diff --git a/arch/arm/mach-msm/smd_init_dt.c b/arch/arm/mach-msm/smd_init_dt.c
|
||||
index 1766a68bfa8..df88bf5b35c 100644
|
||||
--- a/arch/arm/mach-msm/smd_init_dt.c
|
||||
+++ b/arch/arm/mach-msm/smd_init_dt.c
|
||||
@@ -21,7 +21,7 @@
|
||||
#include <linux/io.h>
|
||||
|
||||
#include <mach/msm_ipc_logging.h>
|
||||
-#include <smd_private.h>
|
||||
+#include "smd_private.h"
|
||||
|
||||
#define MODULE_NAME "msm_smd"
|
||||
#define IPC_LOG(level, x...) do { \
|
||||
13
device/linux-amazon-thor/03_msm_fix_trace.patch
Normal file
13
device/linux-amazon-thor/03_msm_fix_trace.patch
Normal file
@ -0,0 +1,13 @@
|
||||
diff --git a/drivers/video/msm/mdss/mdss_mdp_trace.h b/drivers/video/msm/mdss/mdss_mdp_trace.h
|
||||
index 33fe3a4..730b7ff 100644
|
||||
--- a/drivers/video/msm/mdss/mdss_mdp_trace.h
|
||||
+++ b/drivers/video/msm/mdss/mdss_mdp_trace.h
|
||||
@@ -17,7 +17,7 @@
|
||||
#undef TRACE_SYSTEM
|
||||
#define TRACE_SYSTEM mdss
|
||||
#undef TRACE_INCLUDE_PATH
|
||||
-#define TRACE_INCLUDE_PATH .
|
||||
+#define TRACE_INCLUDE_PATH ../../drivers/video/msm/mdss
|
||||
#undef TRACE_INCLUDE_FILE
|
||||
#define TRACE_INCLUDE_FILE mdss_mdp_trace
|
||||
|
||||
@ -1,120 +1,97 @@
|
||||
# APKBUILD based on lg-mako aport.
|
||||
#
|
||||
# Kernel config based on: arch/arm/configs/msm8974-hdx_defconfig
|
||||
# Changes:
|
||||
# - pmOS required options set
|
||||
|
||||
_vendor=amazon
|
||||
_flavor=amazon-thor
|
||||
_config="config-${_flavor}.armhf"
|
||||
|
||||
_hash="f73e4eec8717c6104eca954cf9c259d9d37c38a5"
|
||||
|
||||
pkgname=linux-${_flavor}
|
||||
pkgname="linux-amazon-thor"
|
||||
pkgver=3.4.113
|
||||
case $pkgver in
|
||||
*.*.*) _kernver=${pkgver%.*};;
|
||||
*.*) _kernver=$pkgver;;
|
||||
esac
|
||||
pkgrel=0
|
||||
arch="armhf"
|
||||
pkgrel=1
|
||||
pkgdesc="Phoenix Kernel for the 7-inch Kindle Fire HDX 3rd generation"
|
||||
url="https://github.com/ggow/kernel_phoenix_hdx-common"
|
||||
depends=""
|
||||
makedepends="perl sed installkernel bash gmp-dev bc linux-headers elfutils-dev xz dtbtool"
|
||||
arch="armhf"
|
||||
_carch="arm"
|
||||
_flavor="amazon-thor"
|
||||
url="https://kernel.org"
|
||||
license="GPL2"
|
||||
options="!strip !check !tracedeps"
|
||||
install=
|
||||
makedepends="perl sed installkernel bash gmp-dev bc linux-headers elfutils-dev xz dtbtool"
|
||||
HOSTCC="${CC:-gcc}"
|
||||
HOSTCC="${HOSTCC#${CROSS_COMPILE}}"
|
||||
|
||||
# Source
|
||||
_repository="kernel_phoenix_hdx-common"
|
||||
_commit="f73e4eec8717c6104eca954cf9c259d9d37c38a5"
|
||||
_config="config-${_flavor}.${arch}"
|
||||
source="
|
||||
$pkgname-$_hash.tar.gz::https://github.com/ggow/kernel_phoenix_hdx-common/archive/${_hash}.tar.gz
|
||||
$pkgname-$_commit.tar.gz::https://github.com/ggow/${_repository}/archive/${_commit}.tar.gz
|
||||
$_config
|
||||
compiler-gcc6.h
|
||||
00_fix_smd_private.patch
|
||||
00_fix_qaudio.patch
|
||||
00_fix_return_address.patch
|
||||
00_Input-sentelic-use-static-inline-instead-of-inline.patch
|
||||
00_Input-lifebook-use-static-inline-instead-of-inline-i.patch
|
||||
02_gpu-msm-fix-gcc5-compile.patch
|
||||
03_msm_fix_trace.patch
|
||||
06_fix_mdss_fb_rgb_mode.patch
|
||||
"
|
||||
subpackages=""
|
||||
license="GPL2"
|
||||
|
||||
_abi_release=${pkgver}
|
||||
_carch="arm"
|
||||
HOSTCC="${CC:-gcc}"
|
||||
HOSTCC="${HOSTCC#${CROSS_COMPILE}}"
|
||||
|
||||
ksrcdir="$srcdir/kernel_phoenix_hdx-common-${_hash}"
|
||||
builddir="$srcdir/${_repository}-${_commit}"
|
||||
|
||||
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
|
||||
default_prepare
|
||||
|
||||
# gcc6 support
|
||||
cp -v "$srcdir/compiler-gcc6.h" "$ksrcdir/include/linux/"
|
||||
cp -v "$srcdir/compiler-gcc6.h" "$builddir/include/linux/"
|
||||
|
||||
mkdir -p "$srcdir"/build
|
||||
cp "$srcdir"/$_config "$srcdir"/build/.config
|
||||
make -C "$ksrcdir" O="$srcdir"/build ARCH="$_carch" HOSTCC="$HOSTCC" \
|
||||
silentoldconfig
|
||||
# Remove -Werror from all makefiles
|
||||
local i
|
||||
local makefiles="$(find . -type f -name Makefile)
|
||||
$(find . -type f -name Kbuild)"
|
||||
for i in $makefiles; do
|
||||
sed -i 's/-Werror-/-W/g' "$i"
|
||||
sed -i 's/-Werror//g' "$i"
|
||||
done
|
||||
|
||||
# Prepare kernel config ('yes ""' for kernels lacking olddefconfig)
|
||||
cp "$srcdir"/$_config "$builddir"/.config
|
||||
yes "" | make ARCH="$_carch" HOSTCC="$HOSTCC" oldconfig
|
||||
}
|
||||
|
||||
build() {
|
||||
cd "$srcdir"/build
|
||||
unset LDFLAGS
|
||||
|
||||
echo "--[ Build kernel ]--"
|
||||
make ARCH="$_carch" CC="${CC:-gcc}" \
|
||||
KBUILD_BUILD_VERSION="$((pkgrel + 1 ))-Alpine"
|
||||
KBUILD_BUILD_VERSION="$((pkgrel + 1 ))-postmarketOS"
|
||||
|
||||
echo "--[ Generate master DTB ]--"
|
||||
dtbTool -s 2048 -p "scripts/dtc/" -o "arch/arm/boot/dt.img" "arch/arm/boot/"
|
||||
dtbTool -s 2048 -p "scripts/dtc/" -o "arch/arm/boot/dt.img" "arch/arm/boot/" --version=1
|
||||
}
|
||||
|
||||
package() {
|
||||
echo "--[ Installing kernel ]--"
|
||||
install -Dm644 "$srcdir/build/arch/arm/boot/zImage" \
|
||||
"$pkgdir/boot/vmlinuz-$_flavor"
|
||||
|
||||
echo "--[ Installing master DTB ]--"
|
||||
install -Dm644 "$srcdir/build/arch/arm/boot/dt.img" \
|
||||
"$pkgdir/boot/dt.img"
|
||||
|
||||
install -D "$srcdir/build/include/config/kernel.release" \
|
||||
# kernel.release
|
||||
install -D "$builddir/include/config/kernel.release" \
|
||||
"$pkgdir/usr/share/kernel/$_flavor/kernel.release"
|
||||
|
||||
cd "$srcdir"/build
|
||||
unset LDFLAGS
|
||||
|
||||
echo "--[ Installing modules ]--"
|
||||
make ARCH="$_carch" CC="${CC:-gcc}" KBUILD_BUILD_VERSION="$((pkgrel + 1 ))-Alpine" \
|
||||
CONFIG_NO_ERROR_ON_MISMATCH=y \
|
||||
INSTALL_MOD_PATH="$pkgdir" INSTALL_MOD_STRIP=1 modules_install
|
||||
# zImage (find the right one)
|
||||
cd "$builddir/arch/$_carch/boot"
|
||||
_target="$pkgdir/boot/vmlinuz-$_flavor"
|
||||
for _zimg in zImage-dtb Image.gz-dtb *zImage Image; do
|
||||
[ -e "$_zimg" ] || continue
|
||||
msg "zImage found: $_zimg"
|
||||
install -Dm644 "$_zimg" "$_target"
|
||||
break
|
||||
done
|
||||
if ! [ -e "$_target" ]; then
|
||||
error "Could not find zImage in $PWD!"
|
||||
return 1
|
||||
fi
|
||||
|
||||
install -Dm644 "$builddir/arch/$_carch/boot/dt.img" \
|
||||
"$pkgdir/boot/dt.img"
|
||||
}
|
||||
|
||||
sha512sums="7d9f9001c6fc11954922070e3ed18f7e2843d5cd45dbab0f86ab332d6c45ee0279dd2c9bf498d91c017322f8b56f7f7417f132201bf2104ea5826212d09224f7 linux-amazon-thor-f73e4eec8717c6104eca954cf9c259d9d37c38a5.tar.gz
|
||||
d682b04c30b7829d6e90b4ad3eb40201ff253dfdb1717742b6b6574b8d3c86abc95e6f7ee8e8ab097520b41e0240b06bdd75fc8be727ac481e656c4d23f8dd30 config-amazon-thor.armhf
|
||||
d80980e9474c82ba0ef1a6903b434d8bd1b092c40367ba543e72d2c119301c8b2d05265740e4104ca1ac5d15f6c4aa49e8776cb44264a9a28dc551e0d1850dcc compiler-gcc6.h
|
||||
ddf6caae3f087f21fbfdc258da1c05731bc14c24fe25ce1383133140129d44c48dc427b52d93ed7395def9ad5bf4dab01cc2792581c8ec3e10278c014a64d240 00_fix_smd_private.patch
|
||||
f40a9b3395882046adc66f97631dc85815f1901471559a40df502ec3fb0334ce2fd14202cd2a2b0de5a5e78deb103983bb0bcf9a5dce14cf1048b9750ebba6fa 00_fix_qaudio.patch
|
||||
ea1d3b5a234fa565e3c1a792de48f4fc4e6023d281d303c8e319c7ef28edc5739ab0e4dea0139a41f0a5c7d03e27921ccaa214fd0ac5c72245a094ce60128864 00_fix_return_address.patch
|
||||
2d77d90b501aa8afbf81629e73fc0a2055b373942975f58277e43f398d0835b3dbbff4a1118137ec82873ba90a254fea87c1d73ba7708578f1779bd0b4c6ff2d 00_Input-sentelic-use-static-inline-instead-of-inline.patch
|
||||
5c49f6ff6773a7dc3067d2b1359648fe7a9f758b6c068d6fa69d9aaf24a291ba8022c960317d926aabc11d020a71b20c4e81a6fcf9b21ef66d9b6d065bae23e9 00_Input-lifebook-use-static-inline-instead-of-inline-i.patch
|
||||
7be03a9e78b7ac330a54b1f00509caa0621a95c0c55901878ad757f9dd69cc05ba2c8b5ea987063ae1224f92c4d090d515fa5d369e7755181a4871b0d0f82881 02_gpu-msm-fix-gcc5-compile.patch
|
||||
657630a1ebd5a9aff872530022e83b1087ef3c0eb7a214d350c9caf779c2691f92de6630a40d735b5f7a34ba6a3e9e7eb708d3deb52f134d53164836c312e5e9 03_msm_fix_trace.patch
|
||||
2ce72397039e5a842e6564586ec14dcd2aaf0430959a42c18406c9c3736ce6f6fc6af146b345fa81977748a3182ce585af0da5db3e39cd4dc5314b6186478a64 06_fix_mdss_fb_rgb_mode.patch"
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user