From 06b53a9a64179be9259c73fde68aa91c6488c645 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matt=C3=A9o=20Delabre?= Date: Mon, 21 Nov 2022 00:29:41 -0500 Subject: [PATCH] Add linux-mainline-perf and linux-stracciatella-perf as split packages --- package/linux-mainline/package | 74 ++++++++++++++++++----------- package/linux-stracciatella/package | 74 ++++++++++++++++++----------- package/perf/package | 27 ----------- 3 files changed, 90 insertions(+), 85 deletions(-) delete mode 100644 package/perf/package diff --git a/package/linux-mainline/package b/package/linux-mainline/package index fe964dfc6..6e5de7338 100644 --- a/package/linux-mainline/package +++ b/package/linux-mainline/package @@ -3,12 +3,9 @@ # SPDX-License-Identifier: MIT archs=(rm2) -pkgnames=(linux-mainline) -pkgdesc="reMarkable 2 kernel based on the mainline kernel" -url=https://www.kernel.org +pkgnames=(linux-mainline linux-mainline-perf) pkgver=6.0.0-1 -timestamp=2022-05-22T21:50:09Z -section=kernel +timestamp=2022-10-02T21:43:31Z maintainer="Alistair Francis " makedepends=(build:flex build:bison build:libssl-dev build:bc build:lzop build:libgmp-dev build:libmpc-dev) license=GPL-2.0-only @@ -21,35 +18,54 @@ sha256sums=(1583d553380a656ecaac8dab89558051e9165983381adc9c3d52fb8ac0ce19fd) build() { ARCH=arm make imx_v6_v7_defconfig ARCH=arm make -j8 + ARCH=arm make -j8 tools/perf } -package() { - # Prepare files for the kernel archive - local staging="$srcdir"/staging - mkdir -p "$staging/boot" +linux-mainline() { + pkgdesc="reMarkable 2 kernel based on the mainline kernel" + url=https://www.kernel.org + section=kernel + installdepends=(kernelctl) - cp --no-dereference {"$srcdir"/arch/arm,"$staging"}/boot/zImage - cp --no-dereference "$srcdir"/arch/arm/boot/dts/imx7d-remarkable2.dtb \ - "$staging"/boot/zero-sugar.dtb + package() { + # Prepare files for the kernel archive + local staging="$srcdir"/staging + mkdir -p "$staging/boot" - ARCH=arm make -C "$srcdir" modules_install INSTALL_MOD_PATH="$staging" - rm "$staging"/lib/modules/*/{source,build} + cp --no-dereference {"$srcdir"/arch/arm,"$staging"}/boot/zImage + cp --no-dereference "$srcdir"/arch/arm/boot/dts/imx7d-remarkable2.dtb \ + "$staging"/boot/zero-sugar.dtb - # Create the kernel archive - local archive="mainline-${pkgver%-*}.tar.bz2" - install -d "$pkgdir"/opt/usr/share/kernelctl - (cd "$staging" && tar --owner root:0 --group root:0 --mtime=$timestamp \ - -cjf "$pkgdir"/opt/usr/share/kernelctl/"$archive" boot/* lib/modules/*) + ARCH=arm make -C "$srcdir" modules_install INSTALL_MOD_PATH="$staging" + rm "$staging"/lib/modules/*/{source,build} + + # Create the kernel archive + local archive="mainline-${pkgver%-*}.tar.bz2" + install -d "$pkgdir"/opt/usr/share/kernelctl + (cd "$staging" && tar --owner root:0 --group root:0 --mtime=$timestamp \ + -cjf "$pkgdir"/opt/usr/share/kernelctl/"$archive" boot/* lib/modules/*) + } + + configure() { + echo "The new kernel files have been copied, but not installed." + echo "Please use kernelctl to select the kernel to boot." + echo + echo "Known issues with the mainline kernel:" + echo " - No support for low power mode (suspend uses more power then it should)" + echo " - WiFi sometimes is off on boot (can be turned on again though)" + echo " - GUI shutdown in Oxide doesn't work" + echo " - Wacom stylus doesn't work in Xochitl (works everywhere else though)" + echo " - No OTG control support" + } } -configure() { - echo "The new kernel files have been copied, but not installed." - echo "Please use kernelctl to select the kernel to boot." - echo - echo "Known issues with the mainline kernel:" - echo " - No support for low power mode (suspend uses more power then it should)" - echo " - WiFi sometimes is off on boot (can be turned on again though)" - echo " - GUI shutdown in Oxide doesn't work" - echo " - Wacom stylus doesn't work in Xochitl (works everywhere else though)" - echo " - No OTG control support" +linux-mainline-perf() { + pkgdesc="Linux profiling with performance counters" + url=https://perf.wiki.kernel.org + section=devel + + package() { + install -D -m 755 -t "$pkgdir"/opt/bin "$srcdir"/tools/perf/perf + ln -s /opt/bin/perf "$pkgdir"/opt/bin/trace + } } diff --git a/package/linux-stracciatella/package b/package/linux-stracciatella/package index 74111f4a7..0dd9efb26 100644 --- a/package/linux-stracciatella/package +++ b/package/linux-stracciatella/package @@ -3,17 +3,14 @@ # SPDX-License-Identifier: MIT archs=(rm1 rm2) -pkgnames=(linux-stracciatella) -pkgdesc="RemarkableAS's vanilla kernel with a few extra flakes" -url=https://github.com/Etn40ff/linux-remarkable +pkgnames=(linux-stracciatella linux-stracciatella-perf) pkgver=5.4.70-2 timestamp=2022-09-26T21:23:39Z -section="kernel" maintainer="Salvatore Stella " makedepends=(build:flex build:bison build:libssl-dev build:bc build:lzop build:libgmp-dev build:libmpc-dev build:kmod) license=GPL-2.0-only flags=(nostrip) -installdepends=(kernelctl) + image=base:v2.3 source=(https://github.com/Etn40ff/linux-remarkable/archive/41121ea10ed2235c441cfe717461988859d7f5b6.tar.gz) sha256sums=(ade87a10bfa7069222cbf8eb1d00ca460d38aab9685223d2fa3ee4f363a75cfa) @@ -25,35 +22,54 @@ build() { ARCH=arm make zero-sugar_defconfig fi ARCH=arm make -j8 + ARCH=arm make -j8 tools/perf } -package() { - # Prepare files for the kernel archive - local staging="$srcdir"/staging - mkdir -p "$staging/boot" +linux-stracciatella() { + pkgdesc="RemarkableAS's vanilla kernel with a few extra flakes" + url=https://github.com/Etn40ff/linux-remarkable + section="kernel" + installdepends=(kernelctl) - cp --no-dereference {"$srcdir"/arch/arm,"$staging"}/boot/zImage - if [[ $arch = rm1 ]]; then - cp --no-dereference "$srcdir"/arch/arm/boot/dts/zero-gravitas.dtb "$staging"/boot/zero-gravitas.dtb - elif [[ $arch = rm2 ]]; then - cp --no-dereference "$srcdir"/arch/arm/boot/dts/zero-sugar.dtb "$staging"/boot/zero-sugar.dtb - fi + package() { + # Prepare files for the kernel archive + local staging="$srcdir"/staging + mkdir -p "$staging/boot" - ARCH=arm make -C "$srcdir" modules_install INSTALL_MOD_PATH="$staging" - rm "$staging"/lib/modules/*/{source,build} + cp --no-dereference {"$srcdir"/arch/arm,"$staging"}/boot/zImage + if [[ $arch = rm1 ]]; then + cp --no-dereference "$srcdir"/arch/arm/boot/dts/zero-gravitas.dtb "$staging"/boot/zero-gravitas.dtb + elif [[ $arch = rm2 ]]; then + cp --no-dereference "$srcdir"/arch/arm/boot/dts/zero-sugar.dtb "$staging"/boot/zero-sugar.dtb + fi - # Create the kernel archive - local archive="stracciatella-${pkgver%-*}.tar.bz2" - install -d "$pkgdir"/opt/usr/share/kernelctl - (cd "$staging" && tar --owner root:0 --group root:0 --mtime=$timestamp \ - -cjf "$pkgdir"/opt/usr/share/kernelctl/"$archive" boot/* lib/modules/*) + ARCH=arm make -C "$srcdir" modules_install INSTALL_MOD_PATH="$staging" + rm "$staging"/lib/modules/*/{source,build} + + # Create the kernel archive + local archive="stracciatella-${pkgver%-*}.tar.bz2" + install -d "$pkgdir"/opt/usr/share/kernelctl + (cd "$staging" && tar --owner root:0 --group root:0 --mtime=$timestamp \ + -cjf "$pkgdir"/opt/usr/share/kernelctl/"$archive" boot/* lib/modules/*) + } + + configure() { + if [[ $(< /etc/version) -le 20210709090000 ]]; then + echo "WARNING: Your system is too old; this kernel will most likely not work unless you add the appropriate firmware blobs to /lib/firmware." + echo "Please consider updating your system instead." + fi + echo "The new kernel files have been copied, but not installed." + echo "Please use kernelctl to select the kernel to boot." + } } -configure() { - if [[ $(< /etc/version) -le 20210709090000 ]]; then - echo "WARNING: Your system is too old; this kernel will most likely not work unless you add the appropriate firmware blobs to /lib/firmware." - echo "Please consider updating your system instead." - fi - echo "The new kernel files have been copied, but not installed." - echo "Please use kernelctl to select the kernel to boot." +linux-stracciatella-perf() { + pkgdesc="Linux profiling with performance counters" + url=https://perf.wiki.kernel.org + section=devel + + package() { + install -D -m 755 -t "$pkgdir"/opt/bin "$srcdir"/tools/perf/perf + ln -s /opt/bin/perf "$pkgdir"/opt/bin/trace + } } diff --git a/package/perf/package b/package/perf/package deleted file mode 100644 index a43caa076..000000000 --- a/package/perf/package +++ /dev/null @@ -1,27 +0,0 @@ -#!/usr/bin/env bash -# Copyright (c) 2022 The Toltec Contributors -# SPDX-License-Identifier: MIT - -pkgnames=(perf) -pkgdesc="Linux profiling with performance counters" -url=https://perf.wiki.kernel.org -pkgver=5.18.0-1 -timestamp=2022-05-22T21:50:09Z -section=kernel -maintainer="Mattéo Delabre " -license=GPL-2.0-only -makedepends=(build:bc build:lzop build:git build:flex build:bison) - -image=base:v2.3 -source=(https://github.com/alistair23/linux/archive/f9fe680995e01398f0813077711fe1b744251c5b.tar.gz) -sha256sums=(d38c883a31f5f87483377e78b4b3a2eb1ce73ada38fc25949e692dd0b2dd7895) - -build() { - make imx_v6_v7_defconfig - ARCH=arm make tools/perf -} - -package() { - install -D -m 755 -t "$pkgdir"/opt/bin "$srcdir"/tools/perf/perf - ln -s /opt/bin/perf "$pkgdir"/opt/bin/trace -}