Skip to content

Instantly share code, notes, and snippets.

Embed
What would you like to do?
Diffs to remove Manjaro ARM kernels conflicts
diff --git a/PKGBUILD b/PKGBUILD
index 727ea40..93ec8d3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,11 +7,11 @@ _srcname=linux-5.12
_kernelname=${pkgbase#linux}
_desc="AArch64 multi-platform"
pkgver=5.12.10
-pkgrel=1
+pkgrel=99
arch=('aarch64')
url="http://www.kernel.org/"
license=('GPL2')
-makedepends=('xmlto' 'docbook-xsl' 'kmod' 'inetutils' 'bc' 'git' 'uboot-tools' 'dtc')
+makedepends=('xmlto' 'docbook-xsl' 'kmod' 'inetutils' 'bc' 'git' 'dtc')
options=('!strip')
source=("http://www.kernel.org/pub/linux/kernel/v5.x/${_srcname}.tar.xz"
"http://www.kernel.org/pub/linux/kernel/v5.x/patch-${pkgver}.xz"
@@ -253,9 +253,6 @@ _package() {
pkgdesc="The Linux Kernel and modules - ${_desc}"
depends=('coreutils' 'linux-firmware' 'kmod' 'mkinitcpio>=0.7')
optdepends=('crda: to set the correct wireless channels of your country')
- provides=('kernel26' "linux=${pkgver}")
- conflicts=('kernel26' 'linux')
- replaces=('linux-armv8' 'linux-aarch64')
backup=("etc/mkinitcpio.d/${pkgbase}.preset")
install=${pkgname}.install
@@ -310,9 +307,6 @@ _package() {
_package-headers() {
pkgdesc="Header files and scripts for building modules for linux kernel - ${_desc}"
- provides=("linux-headers=${pkgver}")
- conflicts=('linux-headers')
- replaces=('linux-aarch64-headers')
cd ${_srcname}
local _builddir="${pkgdir}/usr/lib/modules/${_kernver}/build"
diff --git a/PKGBUILD b/PKGBUILD
index abcaa93..60261cf 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -10,7 +10,7 @@ _srcname=linux-${_commit}
_kernelname=${pkgbase#linux}
_desc="Raspberry Pi 4 64-bit kernel"
pkgver=5.12.6
-pkgrel=1
+pkgrel=99
arch=('aarch64')
url="http://www.kernel.org/"
license=('GPL2')
@@ -19,13 +19,13 @@ options=('!strip')
source=("https://github.com/raspberrypi/linux/archive/${_commit}.tar.gz"
'config'
# 'vc4_place-do-not-reject-fractional-source-coords.diff'
- 'linux.preset'
+ 'linux-rpi4-mainline.preset'
'60-linux.hook'
'90-linux.hook')
md5sums=('2eb1d02caaad8743f02b1c083e582df6'
- 'd48d344b780a87889d0531d7ed84fed3'
- '86d4a35722b5410e3b29fc92dae15d4b'
+ 'SKIP'
+ 'SKIP'
'ce6c81ad1ad1f8b333fd6077d47abdaf'
'441ec084c47cddc53e592fb0cbce4edf')
@@ -76,8 +76,6 @@ _package() {
pkgdesc="The Linux Kernel and modules - ${_desc}"
depends=('coreutils' 'linux-firmware' 'kmod' 'mkinitcpio>=0.7' 'firmware-raspberrypi')
optdepends=('crda: to set the correct wireless channels of your country')
- provides=('kernel26' "linux=${pkgver}")
- conflicts=('kernel26' 'linux' 'uboot-raspberrypi')
install=${pkgname}.install
replaces=('linux-raspberrypi-latest')
@@ -90,17 +88,10 @@ _package() {
_basekernel=${_kernver%%-*}
_basekernel=${_basekernel%.*}
- mkdir -p "${pkgdir}"/{boot/overlays,usr/lib/modules}
+ mkdir -p "${pkgdir}"/{boot,usr/lib/modules}
make INSTALL_MOD_PATH="${pkgdir}/usr" modules_install
- cp arch/$KARCH/boot/dts/broadcom/bcm2711-rpi-cm4.dtb "${pkgdir}/boot"
- cp arch/$KARCH/boot/dts/broadcom/bcm2711-rpi-4-b.dtb "${pkgdir}/boot"
- cp arch/$KARCH/boot/dts/broadcom/bcm2711-rpi-400.dtb "${pkgdir}/boot"
- cp arch/$KARCH/boot/dts/broadcom/bcm2710-rpi-3-b-plus.dtb "${pkgdir}/boot"
- cp arch/$KARCH/boot/dts/broadcom/bcm2710-rpi-3-b.dtb "${pkgdir}/boot"
- cp arch/$KARCH/boot/Image "${pkgdir}/boot/kernel8.img"
- cp arch/$KARCH/boot/dts/overlays/*.dtb* "${pkgdir}/boot/overlays"
- cp arch/$KARCH/boot/dts/overlays/README "${pkgdir}/boot/overlays"
+ cp arch/$KARCH/boot/Image "${pkgdir}/boot/Image-rpi4-mainline"
# make room for external modules
local _extramodules="extramodules-${_basekernel}${_kernelname}"
@@ -136,8 +127,6 @@ _package() {
_package-headers() {
pkgdesc="Header files and scripts for building modules for linux kernel - ${_desc}"
- provides=("linux-headers=${pkgver}")
- conflicts=('linux-headers')
replaces=('linux-raspberrypi-latest-headers')
cd ${_srcname}
diff --git a/config b/config
index bf3d3ea..55ac7f2 100644
--- a/config
+++ b/config
@@ -22,7 +22,7 @@ CONFIG_THREAD_INFO_IN_TASK=y
#
CONFIG_INIT_ENV_ARG_LIMIT=32
# CONFIG_COMPILE_TEST is not set
-CONFIG_LOCALVERSION="-MANJARO-ARM"
+CONFIG_LOCALVERSION="-MANJARO-ARM-rpi"
# CONFIG_LOCALVERSION_AUTO is not set
CONFIG_BUILD_SALT=""
CONFIG_DEFAULT_INIT=""
diff --git a/linux-rpi4-mainline.install b/linux-rpi4-mainline.install
index 126a436..87fd663 100644
--- a/linux-rpi4-mainline.install
+++ b/linux-rpi4-mainline.install
@@ -1,61 +1,7 @@
post_install () {
- if [ -f /boot/cmdline.txt ]; then
- echo "===> Keeping old cmdline.txt file..."
- else
- echo "===> Installing default cmdline.txt file to /boot/..."
- echo "root=LABEL=ROOT_MNJRO rw rootwait console=serial0,115200 console=tty1 selinux=0 plymouth.enable=0 smsc95xx.turbo_mode=N dwc_otg.lpm_enable=0 kgdboc=serial0,115200 elevator=noop usbhid.mousepoll=8 snd-bcm2835.enable_compat_alsa=0 audit=0" > /boot/cmdline.txt
- fi
-
- if [ -f /boot/config.txt ]; then
- echo "===> Keeping old config.txt file..."
- else
- echo "===> Installing default config.txt file to /boot/..."
- echo "# See /boot/overlays/README for all available options" > /boot/config.txt
- echo "" >> /boot/config.txt
- echo "gpu_mem=64" >> /boot/config.txt
- echo "initramfs initramfs-linux.img followkernel" >> /boot/config.txt
- echo "kernel=kernel8.img" >> /boot/config.txt
- echo "arm_64bit=1" >> /boot/config.txt
- echo "disable_overscan=1" >> /boot/config.txt
- echo "" >> /boot/config.txt
- echo "#enable sound" >> /boot/config.txt
- echo "dtparam=audio=on" >> /boot/config.txt
- echo "#hdmi_drive=2" >> /boot/config.txt
- echo "" >> /boot/config.txt
- echo "#enable vc4" >> /boot/config.txt
- echo "dtoverlay=vc4-fkms-v3d" >> /boot/config.txt
- echo "max_framebuffers=2" >> /boot/config.txt
- fi
}
post_upgrade() {
- if [ -f /boot/cmdline.txt ]; then
- echo "===> Keeping old cmdline.txt file..."
- else
- echo "===> Installing default config.txt to /boot/..."
- echo "root=LABEL=ROOT_MNJRO rw rootwait console=serial0,115200 console=tty1 selinux=0 plymouth.enable=0 smsc95xx.turbo_mode=N dwc_otg.lpm_enable=0 kgdboc=serial0,115200 elevator=noop usbhid.mousepoll=8 snd-bcm2835.enable_compat_alsa=0 audit=0" > /boot/cmdline.txt
- fi
-
- if [ -f /boot/config.txt ]; then
- echo "===> Keeping old config.txt file..."
- else
- echo "===> Installing default config.txt to /boot/..."
- echo "# See /boot/overlays/README for all available options" > /boot/config.txt
- echo "" >> /boot/config.txt
- echo "gpu_mem=64" >> /boot/config.txt
- echo "initramfs initramfs-linux.img followkernel" >> /boot/config.txt
- echo "kernel=kernel8.img" >> /boot/config.txt
- echo "arm_64bit=1" >> /boot/config.txt
- echo "disable_overscan=1" >> /boot/config.txt
- echo "" >> /boot/config.txt
- echo "#enable sound" >> /boot/config.txt
- echo "dtparam=audio=on" >> /boot/config.txt
- echo "#hdmi_drive=2" >> /boot/config.txt
- echo "" >> /boot/config.txt
- echo "#enable vc4" >> /boot/config.txt
- echo "dtoverlay=vc4-fkms-v3d" >> /boot/config.txt
- echo "max_framebuffers=2" >> /boot/config.txt
- fi
}
post_remove() {
diff --git a/linux.preset b/linux.preset
deleted file mode 100644
index 8d7f379..0000000
--- a/linux.preset
+++ /dev/null
@@ -1,10 +0,0 @@
-# mkinitcpio preset file for the '%PKGBASE%' package
-
-ALL_config="/etc/mkinitcpio.conf"
-ALL_kver="%KERNVER%"
-
-PRESETS=('default')
-
-#default_config="/etc/mkinitcpio.conf"
-default_image="/boot/initramfs-linux.img"
-#default_options=""
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment