mirror of
https://github.com/archlinuxarm/PKGBUILDs.git
synced 2024-11-08 22:45:43 +00:00
core/linux-aarch64-rc to 5.17.rc1-1
This commit is contained in:
Kevin Mihelich
parent
87627e777b
commit
1de9297ece
6 changed files with 350 additions and 202 deletions
|
|
@ -1,4 +1,4 @@
|
|||
From 48da7521af79c8822af5085f1d0eedbec3f08f47 Mon Sep 17 00:00:00 2001
|
||||
From ef472b6f39b038f1572f1c839413600adc8da339 Mon Sep 17 00:00:00 2001
|
||||
From: popcornmix <popcornmix@gmail.com>
|
||||
Date: Tue, 18 Feb 2014 01:43:50 -0300
|
||||
Subject: [PATCH 1/2] net/smsc95xx: Allow mac address to be set as a parameter
|
||||
|
|
@ -8,7 +8,7 @@ Subject: [PATCH 1/2] net/smsc95xx: Allow mac address to be set as a parameter
|
|||
1 file changed, 56 insertions(+)
|
||||
|
||||
diff --git a/drivers/net/usb/smsc95xx.c b/drivers/net/usb/smsc95xx.c
|
||||
index 4c8ee1cff4d4..2ab7d915b5da 100644
|
||||
index abe0149ed917..e62e96352b6e 100644
|
||||
--- a/drivers/net/usb/smsc95xx.c
|
||||
+++ b/drivers/net/usb/smsc95xx.c
|
||||
@@ -50,6 +50,7 @@
|
||||
|
|
@ -87,9 +87,9 @@ index 4c8ee1cff4d4..2ab7d915b5da 100644
|
|||
+ if (smsc95xx_is_macaddr_param(dev, dev->net->dev_addr))
|
||||
+ return;
|
||||
+
|
||||
/* maybe the boot loader passed the MAC address in devicetree */
|
||||
if (!eth_platform_get_mac_address(&dev->udev->dev,
|
||||
dev->net->dev_addr)) {
|
||||
--
|
||||
2.33.0
|
||||
u8 addr[ETH_ALEN];
|
||||
|
||||
/* maybe the boot loader passed the MAC address in devicetree */
|
||||
--
|
||||
2.33.1
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
From 3427bad1eb5e55bb9374cf6bb62eb0d844c72287 Mon Sep 17 00:00:00 2001
|
||||
From 5f26e6ad376e36f2b5d70bcad04562fec7194dee Mon Sep 17 00:00:00 2001
|
||||
From: Kevin Mihelich <kevin@archlinuxarm.org>
|
||||
Date: Mon, 7 Aug 2017 19:34:57 -0600
|
||||
Subject: [PATCH 2/2] arm64: dts: rockchip: disable pwm0 on rk3399-firefly
|
||||
|
|
@ -22,5 +22,5 @@ index c4dd2a6b4836..2c2a78292148 100644
|
|||
|
||||
&pwm2 {
|
||||
--
|
||||
2.33.0
|
||||
2.33.1
|
||||
|
||||
|
|
|
|||
|
|
@ -4,7 +4,6 @@ Operation = Install
|
|||
Operation = Upgrade
|
||||
Operation = Remove
|
||||
Target = usr/lib/modules/%KERNVER%/*
|
||||
Target = usr/lib/modules/%EXTRAMODULES%/*
|
||||
|
||||
[Action]
|
||||
Description = Updating %PKGBASE% module dependencies...
|
||||
|
|
|
|||
|
|
@ -3,8 +3,8 @@
|
|||
|
||||
buildarch=8
|
||||
|
||||
_rcver=5.15
|
||||
_rcrel=7
|
||||
_rcver=5.17
|
||||
_rcrel=1
|
||||
|
||||
pkgbase=linux-aarch64-rc
|
||||
_srcname=linux-${_rcver}-rc${_rcrel}
|
||||
|
|
@ -27,31 +27,30 @@ source=("https://git.kernel.org/torvalds/t/${_srcname}.tar.gz"
|
|||
'linux.preset'
|
||||
'60-linux.hook'
|
||||
'90-linux.hook')
|
||||
md5sums=('9d41c6fb84bd69b5e477c7cd302b0e4f'
|
||||
'21d3e833437461aed3b6ca68b5d8afa0'
|
||||
'd679f49645578a193d6e3c220787a40d'
|
||||
'b59b761dd60e359f3dd51bc93ffd158f'
|
||||
md5sums=('ca9a395596f388687bf785f69b280593'
|
||||
'91d1298599aa31b10f1f3954a450b6c3'
|
||||
'3b781286c0b97cec552ad6c8a7a019dd'
|
||||
'2c9aaebe97cf17e35a421d5e3a0b845e'
|
||||
'e19fbe69f1258b99ee6bed21d7afcbce'
|
||||
'61c5ff73c136ed07a7aadbf58db3d96a'
|
||||
'584777ae88bce2c5659960151b64c7d8'
|
||||
'41cb5fef62715ead2dd109dbea8413d6'
|
||||
'ce6c81ad1ad1f8b333fd6077d47abdaf'
|
||||
'0a5f16bfec6ad982a2f6782724cca8ba'
|
||||
'3dc88030a8f2f5a5f97266d99b149f77')
|
||||
|
||||
prepare() {
|
||||
cd ${_srcname}
|
||||
cd $_srcname
|
||||
|
||||
echo "Setting version..."
|
||||
scripts/setlocalversion --save-scmversion
|
||||
echo "-$pkgrel" > localversion.10-pkgrel
|
||||
echo "${pkgbase#linux}" > localversion.20-pkgname
|
||||
|
||||
# ALARM patches
|
||||
git apply ../0001-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch
|
||||
git apply ../0002-arm64-dts-rockchip-disable-pwm0-on-rk3399-firefly.patch
|
||||
|
||||
cat "${srcdir}/config" > ./.config
|
||||
|
||||
# add pkgrel to extraversion
|
||||
sed -ri "s|^(EXTRAVERSION =)(.*)|\1 \2-${pkgrel}|" Makefile
|
||||
|
||||
# don't run depmod on 'make install'. We'll do this ourselves in packaging
|
||||
sed -i '2iexit 0' scripts/depmod.sh
|
||||
}
|
||||
|
||||
build() {
|
||||
|
|
@ -59,26 +58,7 @@ build() {
|
|||
|
||||
# get kernel version
|
||||
make prepare
|
||||
|
||||
# load configuration
|
||||
# Configure the kernel. Replace the line below with one of your choice.
|
||||
#make menuconfig # CLI menu for configuration
|
||||
#make nconfig # new CLI menu for configuration
|
||||
#make xconfig # X-based configuration
|
||||
#make oldconfig # using old config from previous kernel version
|
||||
# ... or manually edit .config
|
||||
|
||||
# Copy back our configuration (use with new kernel version)
|
||||
#cp ./.config ../${pkgbase}.config
|
||||
|
||||
####################
|
||||
# stop here
|
||||
# this is useful to configure the kernel
|
||||
#msg "Stopping build"
|
||||
#return 1
|
||||
####################
|
||||
|
||||
#yes "" | make config
|
||||
make -s kernelrelease > version
|
||||
|
||||
# build!
|
||||
unset LDFLAGS
|
||||
|
|
@ -97,39 +77,24 @@ _package() {
|
|||
backup=("etc/mkinitcpio.d/${pkgbase}.preset")
|
||||
install=${pkgname}.install
|
||||
|
||||
cd ${_srcname}
|
||||
cd $_srcname
|
||||
local kernver="$(<version)"
|
||||
local modulesdir="$pkgdir/usr/lib/modules/$kernver"
|
||||
|
||||
KARCH=arm64
|
||||
|
||||
# get kernel version
|
||||
_kernver="$(make kernelrelease)"
|
||||
_basekernel=${_kernver%%-*}
|
||||
_basekernel=${_basekernel%.*}
|
||||
|
||||
mkdir -p "${pkgdir}"/{boot,usr/lib/modules}
|
||||
make INSTALL_MOD_PATH="${pkgdir}/usr" modules_install
|
||||
echo "Installing boot image and dtbs..."
|
||||
install -Dm644 arch/arm64/boot/Image{,.gz} -t "${pkgdir}/boot"
|
||||
make INSTALL_DTBS_PATH="${pkgdir}/boot/dtbs" dtbs_install
|
||||
cp arch/$KARCH/boot/Image{,.gz} "${pkgdir}/boot"
|
||||
|
||||
# make room for external modules
|
||||
local _extramodules="extramodules-${_basekernel}${_kernelname}"
|
||||
ln -s "../${_extramodules}" "${pkgdir}/usr/lib/modules/${_kernver}/extramodules"
|
||||
|
||||
# add real version for building modules and running depmod from hook
|
||||
echo "${_kernver}" |
|
||||
install -Dm644 /dev/stdin "${pkgdir}/usr/lib/modules/${_extramodules}/version"
|
||||
echo "Installing modules..."
|
||||
make INSTALL_MOD_PATH="$pkgdir/usr" INSTALL_MOD_STRIP=1 modules_install
|
||||
|
||||
# remove build and source links
|
||||
rm "${pkgdir}"/usr/lib/modules/${_kernver}/{source,build}
|
||||
|
||||
# now we call depmod...
|
||||
depmod -b "${pkgdir}/usr" -F System.map "${_kernver}"
|
||||
rm "$modulesdir"/{source,build}
|
||||
|
||||
# sed expression for following substitutions
|
||||
local _subst="
|
||||
s|%PKGBASE%|${pkgbase}|g
|
||||
s|%KERNVER%|${_kernver}|g
|
||||
s|%EXTRAMODULES%|${_extramodules}|g
|
||||
s|%KERNVER%|${kernver}|g
|
||||
"
|
||||
|
||||
# install mkinitcpio preset file
|
||||
|
|
@ -149,13 +114,14 @@ _package-headers() {
|
|||
replaces=('linux-armv8-rc-headers')
|
||||
conflicts=('linux-headers')
|
||||
|
||||
cd ${_srcname}
|
||||
local builddir="${pkgdir}/usr/lib/modules/${_kernver}/build"
|
||||
cd $_srcname
|
||||
local builddir="$pkgdir/usr/lib/modules/$(<version)/build"
|
||||
|
||||
echo "Installing build files..."
|
||||
install -Dt "$builddir" -m644 .config Makefile Module.symvers System.map vmlinux
|
||||
install -Dt "$builddir" -m644 .config Makefile Module.symvers System.map \
|
||||
localversion.* version vmlinux
|
||||
install -Dt "$builddir/kernel" -m644 kernel/Makefile
|
||||
install -Dt "$builddir/arch/${KARCH}" -m644 arch/${KARCH}/Makefile
|
||||
install -Dt "$builddir/arch/arm64" -m644 arch/arm64/Makefile
|
||||
cp -t "$builddir" -a scripts
|
||||
|
||||
# add xfs and shmem for aufs building
|
||||
|
|
@ -163,8 +129,8 @@ _package-headers() {
|
|||
|
||||
echo "Installing headers..."
|
||||
cp -t "$builddir" -a include
|
||||
cp -t "$builddir/arch/${KARCH}" -a arch/${KARCH}/include
|
||||
install -Dt "$builddir/arch/${KARCH}/kernel" -m644 arch/${KARCH}/kernel/asm-offsets.s
|
||||
cp -t "$builddir/arch/arm64" -a arch/arm64/include
|
||||
install -Dt "$builddir/arch/arm64/kernel" -m644 arch/arm64/kernel/asm-offsets.s
|
||||
mkdir -p "$builddir/arch/arm"
|
||||
cp -t "$builddir/arch/arm" -a arch/arm/include
|
||||
|
||||
|
|
@ -188,7 +154,7 @@ _package-headers() {
|
|||
echo "Removing unneeded architectures..."
|
||||
local arch
|
||||
for arch in "$builddir"/arch/*/; do
|
||||
[[ $arch = */${KARCH}/ || $arch == */arm/ ]] && continue
|
||||
[[ $arch = */arm64/ || $arch == */arm/ ]] && continue
|
||||
echo "Removing $(basename "$arch")"
|
||||
rm -r "$arch"
|
||||
done
|
||||
|
|
@ -232,8 +198,7 @@ _package-chromebook() {
|
|||
|
||||
mkdir -p "${pkgdir}/boot"
|
||||
|
||||
KARCH=arm64
|
||||
image=arch/${KARCH}/boot/Image
|
||||
image=arch/arm64/boot/Image
|
||||
|
||||
chromeos_boards=(
|
||||
'elm'
|
||||
|
|
@ -242,13 +207,10 @@ _package-chromebook() {
|
|||
'trogdor'
|
||||
'asurada'
|
||||
)
|
||||
chromebook_dtbs=($(for b in ${chromeos_boards[@]}; do find arch/${KARCH}/boot -name "*${b}*.dtb" | LC_COLLATE=C sort; done))
|
||||
chromebook_dtbs=($(for b in ${chromeos_boards[@]}; do find arch/arm64/boot -name "*${b}*.dtb" | LC_COLLATE=C sort; done))
|
||||
|
||||
for to_compress in ${chromebook_dtbs[@]} ${image}; do
|
||||
#lzma -9 -z -f -k ${to_compress} # This is 40% smaller but takes ~1 sec longer to boot
|
||||
lz4 -20 -z -f ${to_compress}
|
||||
done
|
||||
echo ${chromebook_dtbs[@]/%/.lz4} | ../generate_chromebook_its.sh ${image}.lz4 ${KARCH} lz4 > kernel.its
|
||||
lz4 -20 -z -f -m ${image}
|
||||
echo ${chromebook_dtbs[@]} | ../generate_chromebook_its.sh ${image}.lz4 arm64 lz4 > kernel.its
|
||||
|
||||
mkimage -D "-I dts -O dtb -p 2048" -f kernel.its vmlinux.uimg
|
||||
dd if=/dev/zero of=bootloader.bin bs=512 count=1
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -31,7 +31,7 @@ for i in ${!dtb_list[@]}; do
|
|||
data = /incbin/("${dtb}");
|
||||
type = "flat_dt";
|
||||
arch = "${arch}";
|
||||
compression = "${compression}";
|
||||
compression = "none";
|
||||
hash {
|
||||
algo = "sha1";
|
||||
};
|
||||
|
|
|
|||
Loading…
Reference in a new issue