Merge branch 'testing' into Eeems-patch-11

toltec-dev · Sep 14, 2024 · eddda6a · eddda6a
2 parents f37358a + a8fac37
commit eddda6a
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 10 deletions.
diff --git a/docs/package.md b/docs/package.md
@@ -336,6 +336,7 @@ screensharing   | Apps for streaming the display between the PC and tablet.
 templates       | Templates for xochitl notebooks.
 splashscreens   | Splashscreens for device startup, poweroff, suspend, etc.
 utils           | System tools and various apps.
+writing         | Apps for writing text.
 
 If the package does not fit into one of the existing sections, you are free to create a new one and document it here.
 

diff --git a/package/launcherctl/package b/package/launcherctl/package
@@ -5,9 +5,9 @@
 pkgnames=(launcherctl)
 pkgdesc="Manage your installed launcher"
 url=https://toltec-dev.org/
-pkgver=0.0.1-2
+pkgver=0.0.1-3
 timestamp=2023-12-18T03:32Z
-section="launcher"
+section="launchers"
 maintainer="Eeems <eeems@eeems.email>"
 license=MIT
 

diff --git a/package/mmc-utils/package b/package/mmc-utils/package
@@ -6,32 +6,40 @@ archs=(rmall)
 pkgnames=(mmc-utils)
 pkgdesc="A tool for monitoring the eMMC protocol"
 url=https://git.kernel.org/pub/scm/utils/mmc/mmc-utils.git/
-pkgver=1.0-0
+pkgver=1.0-1
 timestamp=2021-08-12T19:41:07Z
 section="devel"
 maintainer="Alistair Francis <alistair@alistair23.me>"
 license=GPL-2.0-only
 
 image=base:v2.2
 source=(
-    "https://git.kernel.org/pub/scm/utils/mmc/mmc-utils.git/snapshot/mmc-utils-7769a4d7abe339ce273c13a203394a79a11fcff9.tar.gz"
     0001-Makefile-Remove-Werror.patch
 )
 sha256sums=(
-    0578e546d8893b6207180def7966e7314cae54c237a931b8f94779ce5c7d0668
     SKIP
 )
+_commit=7769a4d7abe339ce273c13a203394a79a11fcff9
+
+prepare() {
+    cd "$srcdir"
+    mkdir mmc-utils
+    cd mmc-utils
+    git init
+    git fetch --depth=1 "https://git.kernel.org/pub/scm/utils/mmc/mmc-utils.git" "$_commit"
+    git checkout -f "$_commit"
+    patch < "$srcdir"/0001-Makefile-Remove-Werror.patch
+}
 
 build() {
     # Use our toolchain
     export AR=arm-linux-gnueabihf-ar
     export CC=arm-linux-gnueabihf-gcc
     export STRIP=arm-linux-gnueabihf-strip
 
-    patch < "$srcdir"/0001-Makefile-Remove-Werror.patch
-    make -j4
+    make -C "$srcdir"/mmc-utils -j4
 }
 
 package() {
-    DESTDIR="$pkgdir" make -C "$srcdir" install
+    DESTDIR="$pkgdir" make -C "$srcdir"/mmc-utils install
 }
diff --git a/package/sysfs_preload/package b/package/sysfs_preload/package
@@ -5,9 +5,9 @@
 pkgnames=(sysfs_preload)
 pkgdesc="A simple preload that forces any calls to /sys/power/state to use systemd instead."
 url="https://github.com/Eeems-Org/sysfs_preload"
-pkgver=1.0.1-1
+pkgver=1.0.1-2
 timestamp=2024-06-22T05:19Z
-section=util
+section=utils
 maintainer="Eeems <eeems@eeems.email>"
 license=MIT