samsung-i9003: change to armv7, remove isorec code (MR 1277)
I noticed that the Samsung i9003 is actually a heimdall-bootimg device. But at the same time, the kernel is assembled as if it is isorec. [ci:skip-build]: already built successfully in CI
This commit is contained in:
km2
Oliver Smith
parent
80f332c9d2
commit
a20c2697be
4 changed files with 9 additions and 33 deletions
|
|
@ -1,10 +1,10 @@
|
|||
# Reference: <https://postmarketos.org/devicepkg>
|
||||
pkgname=device-samsung-i9003
|
||||
pkgver=1
|
||||
pkgrel=26
|
||||
pkgrel=27
|
||||
pkgdesc="Samsung Galaxy SL"
|
||||
url="https://postmarketos.org"
|
||||
arch="armhf"
|
||||
arch="armv7"
|
||||
license="MIT"
|
||||
depends="postmarketos-base linux-samsung-i9003 libsamsung-ipc mkbootimg mesa-dri-swrast"
|
||||
makedepends="devicepkg-dev"
|
||||
|
|
@ -22,5 +22,5 @@ package() {
|
|||
install -D -m644 "$srcdir"/90-android-touch-dev.rules \
|
||||
"$pkgdir"/etc/udev/rules.d/90-android-touch-dev.rules
|
||||
}
|
||||
sha512sums="eaeb459baa89a570e91f87658f60a0c39a799eae03634b1f5b61e728f70d0329aea1c66477e4b60744711f77f66d1e18f38e0489294f6cffcf80028350e11056 deviceinfo
|
||||
sha512sums="341287fd8b458c1f010aaf3ab4d2482504b7fc2237129b42fd7cd7859968dda4809883cf0bfbcb4f5f7d45cea7728b5258eccf244142c527bd2fa0b151b7fe41 deviceinfo
|
||||
079336f0a62fe45e839dcaa56479736fb67125ef5adf9bf73fc513c696d5a9fe14cfc9912f4aeb989476aa23bcd1befca25f0163c827691eea7eec1c7b97f303 90-android-touch-dev.rules"
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@ deviceinfo_dtb=""
|
|||
deviceinfo_modules_initfs=""
|
||||
deviceinfo_external_storage="true"
|
||||
deviceinfo_flash_method="heimdall-bootimg"
|
||||
deviceinfo_arch="armhf"
|
||||
deviceinfo_arch="armv7"
|
||||
|
||||
# Device related
|
||||
deviceinfo_chassis="handset"
|
||||
|
|
@ -30,5 +30,4 @@ deviceinfo_flash_pagesize=4096
|
|||
|
||||
# Heimdall related
|
||||
deviceinfo_flash_heimdall_partition_kernel="NORMALBOOT"
|
||||
deviceinfo_flash_heimdall_partition_initfs="RECOVERY"
|
||||
deviceinfo_flash_heimdall_partition_system="SYSTEM"
|
||||
|
|
|
|||
|
|
@ -3,15 +3,15 @@
|
|||
|
||||
pkgname=linux-samsung-i9003
|
||||
pkgver=3.0.101
|
||||
pkgrel=16
|
||||
pkgrel=17
|
||||
pkgdesc="Samsung Galaxy SL kernel"
|
||||
arch="armhf"
|
||||
arch="armv7"
|
||||
_carch="arm"
|
||||
_flavor="samsung-i9003"
|
||||
url="https://kernel.org"
|
||||
license="GPL-2.0-only"
|
||||
options="!strip !check !tracedeps pmb:cross-native"
|
||||
makedepends="perl sed installkernel bash gmp-dev bc linux-headers elfutils-dev devicepkg-dev busybox-static-armhf"
|
||||
makedepends="perl sed installkernel bash gmp-dev bc linux-headers elfutils-dev devicepkg-dev"
|
||||
|
||||
# Source
|
||||
_repository="android_kernel_samsung_latona"
|
||||
|
|
@ -31,31 +31,8 @@ source="
|
|||
"
|
||||
builddir="$srcdir/$_repository-$_commit"
|
||||
|
||||
prepare_isorec() {
|
||||
# Use Alpine's busybox.static instead of the pre-compiled busybox shipped
|
||||
# with the source
|
||||
mkdir "$builddir"/usr/latona_initramfs_files/
|
||||
cp -v /usr/$(arch_to_hostspec $arch)/bin/busybox.static \
|
||||
"$builddir"/usr/latona_initramfs_files/busybox
|
||||
|
||||
# do not use ramdisk.cpio and ramdisk-recovery-device.cpio, always use
|
||||
# the initramfs from the recovery partition ("isorec"), so we can build
|
||||
# it later and independently from the kernel. also directly boot that
|
||||
# partition, not only when the recovery key combination was used.
|
||||
cd "$builddir"/usr/
|
||||
mv latona_initramfs.list latona_initramfs.list_old
|
||||
grep -v "../../ramdisk" latona_initramfs.list_old > latona_initramfs.list
|
||||
cp -v "$srcdir"/init "$builddir"/usr/latona_initramfs_files/init
|
||||
|
||||
# Paths supplied to gen_initramfs_list.sh are prefixed with "source/".
|
||||
ln -s "$builddir" ln -s "$builddir"/source
|
||||
|
||||
cd "$builddir"
|
||||
}
|
||||
|
||||
prepare() {
|
||||
default_prepare
|
||||
prepare_isorec
|
||||
. downstreamkernel_prepare
|
||||
}
|
||||
|
||||
|
|
@ -78,7 +55,7 @@ package() {
|
|||
}
|
||||
|
||||
sha512sums="b7ca46b856a0c160ae36a98da39147deb85c054e902447ab68bcd4a011986eee486fb681d0bb832b9b57797aca35332483e99379b792bd467b1f030328bd83c7 linux-samsung-i9003-7b8d73dd32e6cd21107f9a963a32a5ed237a6e78.tar.gz
|
||||
ac6d9fd10aca7a9460d26bd78d70a6aacfdc9ca28ec10a04210211f748724dbb0018c6388d407327c8736f896c956b0d8ba4b3c72f05e65cd664a8261381a9a9 config-samsung-i9003.armhf
|
||||
a4fa4ae2d1ba837b254cc92c1070169ae609d9c334a1ae3195bfda9887db9e1fa69ab9f626d79150a71779137f04fc75386928f191a167663a49800e42e03ca3 config-samsung-i9003.armv7
|
||||
c40eaa11547f5bc2b1ff965506bdfe3015ff16e4b5ad9ccb3b8134ceafd1d32407c4ef2b213e02e036ce1e9bdcbfe768dff7d4b054bec77705a176c1f783b6f5 00_return_address.patch
|
||||
1972a2b5c429d6bf5fa1423e8805bb89bbd80c4efe6d235cb2037de6ba4d15c01e90239392161d6e5a0802eafaab6e8b468a49a12dc5b66469a111262cde2047 01_twl_power_init.patch
|
||||
5b951a2ab60a89fbc3ca209960987035001a6f9147f8ab5c05a6b49ec6dee75d0b6d053bef28df37e583bfc903599beed16692e25ee363e6200e14839d0dda65 02_mfd_driver_fix.patch
|
||||
|
|
|
|||
|
|
@ -614,7 +614,7 @@ CONFIG_IPV6_MULTIPLE_TABLES=y
|
|||
# CONFIG_IPV6_SUBTREES is not set
|
||||
# CONFIG_IPV6_MROUTE is not set
|
||||
# CONFIG_NETLABEL is not set
|
||||
CONFIG_ANDROID_PARANOID_NETWORK=n
|
||||
# CONFIG_ANDROID_PARANOID_NETWORK is not set
|
||||
CONFIG_NET_ACTIVITY_STATS=y
|
||||
CONFIG_NETWORK_SECMARK=y
|
||||
# CONFIG_NETWORK_PHY_TIMESTAMPING is not set
|
||||
Loading…
Reference in a new issue