Skip to content

Commit

Permalink
Merge branch 'testing' into Eeems-patch-9
Browse files Browse the repository at this point in the history
  • Loading branch information
Eeems authored Dec 17, 2024
2 parents 5d176f5 + 66c02ec commit 14e4a0e
Show file tree
Hide file tree
Showing 4 changed files with 144 additions and 0 deletions.
1 change: 1 addition & 0 deletions package/debian-chroot/debian-chroot.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
chroot_path="/home/root/.local/share/debian"
80 changes: 80 additions & 0 deletions package/debian-chroot/package
Original file line number Diff line number Diff line change
@@ -0,0 +1,80 @@
#!/usr/bin/env bash
# Copyright (c) 2023 The Toltec Contributors
# SPDX-License-Identifier: MIT

pkgnames=(debian-chroot debootstrap)
section="utils"
# Each package has it's own timestamp override below
timestamp=2023-12-22T19:37Z
maintainer="Eeems <[email protected]>"
installdepends=(display)
flags=(nostrip)

source=(
https://github.com/Eeems-org/remarkable-debian-chroot/archive/ea12a1bf851f412e8df4b59fe072bce26bb72571.zip
https://salsa.debian.org/installer-team/debootstrap/-/archive/1.0.133/debootstrap-1.0.133.tar.gz
debian-chroot.conf
)
sha256sums=(
3fcd571ba1aa1a5c55a32767c34e6939e0c0e8ad9213425c6d66d25300fe24b8
734af3492eea99de940853e2c00e1a9ebd65c463362155f613aa24b9cc3336a0
SKIP
)

debian-chroot() {
pkgdesc="A minimal Debian chroot for the reMarkable tablet"
url=https://github.com/Eeems-Org/remarkable-debian-chroot
pkgver=0.0.0-1
timestamp=2023-12-22T19:37Z
license=MIT
installdepends=(debootstrap lsof)
package() {
install -D -m 755 \
"$srcdir"/bin/debian-chroot \
"$pkgdir"/opt/bin/debian-chroot
install -D -m 655 \
"$srcdir"/debian-chroot.conf \
"$pkgdir"/home/root/.config/debian-chroot.conf
mkdir -p "$pkgdir"/opt/etc/
ln -s /home/root/.config/debian-chroot.conf \
"$pkgdir"/opt/etc/debian-chroot.conf
source "$srcdir"/debian-chroot.conf
mkdir -p "$pkgdir"/opt/lib/
ln -s "$chroot_path" "$pkgdir"/opt/lib/debian-chroot
}
configure() {
# Force debian chroot to install iteself
debian-chroot true
}
preremove() {
source /home/root/.config/debian-chroot.conf
if lsof "$chroot_path" 2> /dev/null | grep "$chroot_path"; then
echo "Error: debian-chroot has running processes"
exit 1
fi
if grep -q "$chroot_path " /proc/mounts; then
/bin/umount -R "$chroot_path"
fi
cp /home/root/.config/debian-chroot.conf /tmp/_debian-chroot.conf
}
postremove() {
source /tmp/_debian-chroot.conf
rm -rf "$chroot_path"
rm /tmp/_debian-chroot.conf
}
}

debootstrap() {
pkgdesc="debootstrap is a tool which will install a Debian base system into a subdirectory of another, already installed system."
installdepends=(perl ar)
url=https://wiki.debian.org/Debootstrap
pkgver=1.0.133-1
timestamp=2023-10-21T11:38Z
license=MIT
package() {
cd "$srcdir"
sed -i 's|/usr/sbin|/sbin|' Makefile
make DESTDIR="$pkgdir"/opt install
sed -i 's|DEBOOTSTRAP_DIR=/usr/share/debootstrap|DEBOOTSTRAP_DIR=/opt/usr/share/debootstrap|' "$pkgdir"/opt/sbin/debootstrap
}
}
4 changes: 4 additions & 0 deletions package/keyd/default.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
[ids]
# 2edd:0001 # type folio

[main]
59 changes: 59 additions & 0 deletions package/keyd/package
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
#!/usr/bin/env bash
# Copyright (c) 2020 The Toltec Contributors
# SPDX-License-Identifier: MIT

archs=(rmallos3)
pkgnames=(keyd)
pkgdesc="A key remapping daemon for linux"
url="https://github.com/rvaiya/keyd"
pkgver=2.4.3-1
timestamp=2023-05-16T10:11Z
section=utils
maintainer="Kai <[email protected]>"
license=MIT

image=base:v3.1
source=(
https://github.com/rvaiya/keyd/archive/refs/tags/v2.4.3.zip
default.conf
)
sha256sums=(
cdfcc2cf0518b9a2d292ebac17b18f78548b92803e2a9deeb9f18c9641bf80e5
SKIP
)

build() {
make PREFIX=/opt CONFIG_DIR=/opt/etc/keyd "CC=${CROSS_COMPILE}cc"
sed -i 's|ExecStart=/usr/bin/keyd|ExecStart=/opt/bin/keyd|' keyd.service
}

package() {
cd "$srcdir"
make PREFIX=/opt CONFIG_DIR=/opt/etc/keyd DESTDIR="$pkgdir" install
rmdir "$pkgdir"/etc/keyd
install -D -m 644 -t "$pkgdir"/etc/systemd/system "$srcdir"/keyd.service
install -D -m 644 -t "$pkgdir"/opt/etc/keyd "$srcdir"/default.conf
}

configure() {
addgroup keyd
systemctl daemon-reload
if is-active keyd; then
systemctl restart keyd
elif ! is-enabled "$pkgname.service"; then
echo ""
echo "Run the following command(s) to enable the keyd service"
how-to-enable "$pkgname.service"
echo ""
echo "You will need to modify /opt/etc/keyd/default.conf before starting the service"
fi
}

preremove() {
disable-unit keyd
delgroup keyd
}

postremove() {
systemctl daemon-reload
}

0 comments on commit 14e4a0e

Please sign in to comment.