Add linux-mainline-perf and linux-stracciatella-perf as split packages

toltec-dev · Nov 21, 2022 · 06b53a9 · 06b53a9
1 parent 94c486b
commit 06b53a9
Show file tree

Hide file tree

Showing 3 changed files with 90 additions and 85 deletions.
diff --git 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 <alistair@alistair23.me>"
 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
@@ -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 <etn45p4m@gmail.com>"
 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