From 958d72cf3e7184c9be60d700d4058ffa46b3ee74 Mon Sep 17 00:00:00 2001 From: Nathaniel van Diepen Date: Mon, 11 Dec 2023 19:06:59 -0700 Subject: [PATCH 01/10] Start working on adding upower and required packages --- package/libglib/package | 41 ++++++++++++++++++++++++++++++++++++++++ package/libgudev/package | 34 +++++++++++++++++++++++++++++++++ package/upower/package | 40 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 115 insertions(+) create mode 100644 package/libglib/package create mode 100644 package/libgudev/package create mode 100644 package/upower/package diff --git a/package/libglib/package b/package/libglib/package new file mode 100644 index 000000000..d534c62f8 --- /dev/null +++ b/package/libglib/package @@ -0,0 +1,41 @@ +#!/usr/bin/env bash +# Copyright (c) 2023 The Toltec Contributors +# SPDX-License-Identifier: MIT + +pkgnames=(libglib) +pkgdesc="Low-level core library that forms the basis for projects such as GTK+ and GNOME." +url=https://gitlab.gnome.org/GNOME/glib/ +timestamp=2023-12-06T21:45:00Z +section=util +maintainer="Eeems " +license=GPL-2.0-or-later +_glib_ver=2.78.3 +pkgver=${_glib_ver}-1 +source=(https://download.gnome.org/sources/glib/2.78/glib-${_glib_ver}.tar.xz) +sha256sums=(609801dd373796e515972bf95fc0b2daa44545481ee2f465c4f204d224b2bc21) +image=base:v3.1 +makedepends=(build:git) +provides=( + gapplication + gdbus + gio + glib + gsettings + gtester + libgio + libgthread + pcre2grep +) + +build() { + meson setup \ + --cross-file /usr/share/meson/cross/arm-linux-gnueabihf \ + --prefix /opt/usr/lib/libglib \ + "${srcdir}/builddir" + meson compile -C "${srcdir}/builddir" + DESTDIR="${srcdir}/installdir" meson install -C "${srcdir}/builddir" +} + +package() { + cp -al "${srcdir}/installdir/." ${pkgdir} +} diff --git a/package/libgudev/package b/package/libgudev/package new file mode 100644 index 000000000..fa3ca4951 --- /dev/null +++ b/package/libgudev/package @@ -0,0 +1,34 @@ +#!/usr/bin/env bash +# Copyright (c) 2023 The Toltec Contributors +# SPDX-License-Identifier: MIT + +pkgnames=(libgudev) +pkgdesc="Library providing GObject bindings for libudev." +url=https://gitlab.gnome.org/GNOME/libgudev +timestamp=2023-07-06T12:30:00Z +section=util +maintainer="Eeems " +license=GPL-2.0-or-later +_libgudev_ver=237 +pkgver=${_libgudev_ver}-1 +source=(https://download.gnome.org/sources/libgudev/${_libgudev_ver}/libgudev-${_libgudev_ver}.tar.xz) +sha256sums=(0d06b21170d20c93e4f0534dbb9b0a8b4f1119ffb00b4031aaeb5b9148b686aa) +image=base:v3.1 +makedepends=( + build:libglib2.0 + host:libglib +) + +build() { + export PKG_CONFIG_LIBDIR="$PKG_CONFIG_LIBDIR:$PKG_CONFIG_SYSROOT_DIR/opt/usr/lib/libglib/lib/pkgconfig" + meson setup \ + --cross-file /usr/share/meson/cross/arm-linux-gnueabihf \ + --prefix /opt/usr/lib/libgudev \ + "${srcdir}/builddir" + meson compile -C "${srcdir}/builddir" + DESTDIR="${srcdir}/installdir" meson install -C "${srcdir}/builddir" +} + +package() { + cp -al "${srcdir}/installdir/." ${pkgdir} +} diff --git a/package/upower/package b/package/upower/package new file mode 100644 index 000000000..ad7d58bdc --- /dev/null +++ b/package/upower/package @@ -0,0 +1,40 @@ +#!/usr/bin/env bash +# Copyright (c) 2023 The Toltec Contributors +# SPDX-License-Identifier: MIT + +pkgnames=(upower) +pkgdesc="Power management support for DeviceKit" +url=https://gitlab.freedesktop.org/upower/upower +timestamp=2023-07-06T09:03:00Z +section=util +maintainer="Eeems " +license=GPL-2.0-or-later +_upower_ver=1.90.1 +pkgver=${_upower_ver}-1 +source=(https://gitlab.freedesktop.org/upower/upower/-/archive/v${_upower_ver}/upower-v${_upower_ver}.zip) +sha256sums=(cba3cea3ae4cd345a4d7a787a47e20b35af00859b7089de5aab4796df406fe00) +image=base:v3.1 +makedepends=( + build:gtk-doc-tools + build:libglib2.0 + build:libglib2.0-dev-bin + build:xsltproc + host:libglib + host:libgudev +) + +build() { + export PKG_CONFIG_LIBDIR="$PKG_CONFIG_LIBDIR:$PKG_CONFIG_SYSROOT_DIR/usr/share/pkgconfig" + export PKG_CONFIG_LIBDIR="$PKG_CONFIG_LIBDIR:$PKG_CONFIG_SYSROOT_DIR/opt/usr/lib/libglib/lib/pkgconfig" + export PKG_CONFIG_LIBDIR="$PKG_CONFIG_LIBDIR:$PKG_CONFIG_SYSROOT_DIR/opt/usr/lib/libgudev/lib/pkgconfig" + meson setup \ + --cross-file /usr/share/meson/cross/arm-linux-gnueabihf \ + --prefix /opt \ + "${srcdir}/builddir" + meson compile -C "${srcdir}/builddir" + DESTDIR="${srcdir}/installdir" meson install -C "${srcdir}/builddir" +} + +package() { + cp -al "${srcdir}/installdir/." ${pkgdir} +} From b50fabc4feb6ab8ec623553e0949552ee0bdd70c Mon Sep 17 00:00:00 2001 From: Nathaniel van Diepen Date: Mon, 11 Dec 2023 20:34:47 -0700 Subject: [PATCH 02/10] Get dbus config working --- package/toltec-base/dbus-toltec-session.conf | 6 ++++ package/toltec-base/dbus-toltec-system.conf | 6 ++++ package/toltec-base/package | 16 ++++++--- package/upower/package | 36 ++++++++++++++++++-- package/upower/upower-toltec.conf | 5 +++ 5 files changed, 62 insertions(+), 7 deletions(-) create mode 100644 package/toltec-base/dbus-toltec-session.conf create mode 100644 package/toltec-base/dbus-toltec-system.conf create mode 100644 package/upower/upower-toltec.conf diff --git a/package/toltec-base/dbus-toltec-session.conf b/package/toltec-base/dbus-toltec-session.conf new file mode 100644 index 000000000..bb9b9d7b9 --- /dev/null +++ b/package/toltec-base/dbus-toltec-session.conf @@ -0,0 +1,6 @@ + + + /opt/etc/dbus-1/session.d + /opt/share/dbus-1/session.d + diff --git a/package/toltec-base/dbus-toltec-system.conf b/package/toltec-base/dbus-toltec-system.conf new file mode 100644 index 000000000..64ae2b544 --- /dev/null +++ b/package/toltec-base/dbus-toltec-system.conf @@ -0,0 +1,6 @@ + + + /opt/etc/dbus-1/system.d + /opt/share/dbus-1/system.d + diff --git a/package/toltec-base/package b/package/toltec-base/package index b333afb84..53cf4e2ca 100644 --- a/package/toltec-base/package +++ b/package/toltec-base/package @@ -6,8 +6,8 @@ archs=(rm1 rm2) pkgnames=(toltec-base) pkgdesc="Metapackage defining the base set of packages in a Toltec install" url=https://toltec-dev.org/ -pkgver=1.2-3 -timestamp=2023-05-08T19:31Z +pkgver=1.3-1 +timestamp=2023-12-12T03:15:23.438Z section="utils" maintainer="Eeems " license=MIT @@ -15,12 +15,20 @@ installdepends=(toltec-bootstrap toltec-completion) installdepends_rm1=(open-remarkable-shutdown) installdepends_rm2=(rm2-suspend-fix) -source=() -sha256sums=() +source=( + dbus-toltec-system.conf + dbus-toltec-session.conf +) +sha256sums=( + SKIP + SKIP +) package() { touch "$srcdir"/emptyfile install -D -m 666 -t "$pkgdir"/usr/share/toltec/reenable.d/toltec-base "$srcdir"/emptyfile + install -D -m 666 -t "$pkgdir"/usr/share/dbus-1/system.d "$srcdir"/dbus-toltec-system.conf + install -D -m 666 -t "$pkgdir"/usr/share/dbus-1/session.d "$srcdir"/dbus-toltec-session.conf } configure() { diff --git a/package/upower/package b/package/upower/package index ad7d58bdc..8306ada05 100644 --- a/package/upower/package +++ b/package/upower/package @@ -11,25 +11,37 @@ maintainer="Eeems " license=GPL-2.0-or-later _upower_ver=1.90.1 pkgver=${_upower_ver}-1 -source=(https://gitlab.freedesktop.org/upower/upower/-/archive/v${_upower_ver}/upower-v${_upower_ver}.zip) -sha256sums=(cba3cea3ae4cd345a4d7a787a47e20b35af00859b7089de5aab4796df406fe00) +source=( + https://gitlab.freedesktop.org/upower/upower/-/archive/v${_upower_ver}/upower-v${_upower_ver}.zip + upower-toltec.conf +) +sha256sums=( + cba3cea3ae4cd345a4d7a787a47e20b35af00859b7089de5aab4796df406fe00 + SKIP +) image=base:v3.1 makedepends=( build:gtk-doc-tools build:libglib2.0 build:libglib2.0-dev-bin - build:xsltproc host:libglib host:libgudev ) build() { + # Workaround https://github.com/toltec-dev/toolchain/issues/33 export PKG_CONFIG_LIBDIR="$PKG_CONFIG_LIBDIR:$PKG_CONFIG_SYSROOT_DIR/usr/share/pkgconfig" export PKG_CONFIG_LIBDIR="$PKG_CONFIG_LIBDIR:$PKG_CONFIG_SYSROOT_DIR/opt/usr/lib/libglib/lib/pkgconfig" export PKG_CONFIG_LIBDIR="$PKG_CONFIG_LIBDIR:$PKG_CONFIG_SYSROOT_DIR/opt/usr/lib/libgudev/lib/pkgconfig" meson setup \ --cross-file /usr/share/meson/cross/arm-linux-gnueabihf \ --prefix /opt \ + -Dgtk-doc=false \ + -Dman=false \ + -Dsysconfdir=/opt/etc \ + -Dudevrulesdir=/lib/udev/hwdb.d \ + -Dudevhwdbdir=/lib/udev/rules.d \ + -Dos_backend=linux \ "${srcdir}/builddir" meson compile -C "${srcdir}/builddir" DESTDIR="${srcdir}/installdir" meson install -C "${srcdir}/builddir" @@ -37,4 +49,22 @@ build() { package() { cp -al "${srcdir}/installdir/." ${pkgdir} + mkdir -p "${pkgdir}/etc/systemd/system/upower.service.d" + cp "${srcdir}/upower-toltec.conf" "${pkgdir}/etc/systemd/system/upower.service.d/" + patchelf \ + --set-rpath '/lib:/usr/lib:/opt/lib:/opt/usr/lib:/opt/usr/lib/libglib/lib:/opt/usr/lib/libgudev/lib' \ + "${pkgdir}/opt/bin/upower" \ + "${pkgdir}/opt/libexec/upowerd" +} + +configure() { + systemctl daemon-reload + systemctl reload dbus + systemctl enable --now upower +} + +postremove() { + systemctl daemon-reload + disable-unit upower + systemctl reload dbus } diff --git a/package/upower/upower-toltec.conf b/package/upower/upower-toltec.conf new file mode 100644 index 000000000..780fb9be6 --- /dev/null +++ b/package/upower/upower-toltec.conf @@ -0,0 +1,5 @@ +[Service] +Environment=LD_LIBRARY_PATH=/lib:/usr/lib:/opt/lib:/opt/usr/lib:/opt/usr/lib/libglib/lib:/opt/usr/lib/libgudev/lib +WorkingDirectory=/opt +PrivateUsers=no +RestrictNamespaces=no From d0694c52eb04c8cc4ec062e73a37ad6e2a1f1d5f Mon Sep 17 00:00:00 2001 From: Nathaniel van Diepen Date: Mon, 11 Dec 2023 20:38:27 -0700 Subject: [PATCH 03/10] Move oxide dbus config to opt --- package/oxide/package | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/oxide/package b/package/oxide/package index 8c2c32049..549e31330 100644 --- a/package/oxide/package +++ b/package/oxide/package @@ -4,7 +4,7 @@ pkgnames=(erode fret oxide rot tarnish decay corrupt anxiety oxide-utils inject_evdev liboxide libsentry) _oxidever=2.6 -pkgver=$_oxidever-3 +pkgver=$_oxidever-4 _sentryver=0.5.0 timestamp=2023-06-05T23:27:53Z maintainer="Eeems " @@ -80,7 +80,7 @@ tarnish() { installdepends=(display xochitl "liboxide=$pkgver" "libsentry=$_sentryver") package() { - install -D -m 644 -t "$pkgdir"/etc/dbus-1/system.d "$srcdir"/release/etc/dbus-1/system.d/codes.eeems.oxide.conf + install -D -m 644 -t "$pkgdir"/opt/share/dbus-1/system.d "$srcdir"/release/etc/dbus-1/system.d/codes.eeems.oxide.conf install -D -m 644 -t "$pkgdir"/lib/systemd/system "$srcdir"/release/etc/systemd/system/tarnish.service install -D -m 755 -t "$pkgdir"/opt/bin "$srcdir"/release/opt/bin/tarnish if [[ $arch = rm2 ]]; then From 1c844e33d48c2deefa9ef9601da49477bf28d74c Mon Sep 17 00:00:00 2001 From: Nathaniel van Diepen Date: Mon, 11 Dec 2023 20:42:31 -0700 Subject: [PATCH 04/10] Fix upower wantedby --- package/upower/upower-toltec.conf | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/upower/upower-toltec.conf b/package/upower/upower-toltec.conf index 780fb9be6..0c47e8254 100644 --- a/package/upower/upower-toltec.conf +++ b/package/upower/upower-toltec.conf @@ -3,3 +3,7 @@ Environment=LD_LIBRARY_PATH=/lib:/usr/lib:/opt/lib:/opt/usr/lib:/opt/usr/lib/lib WorkingDirectory=/opt PrivateUsers=no RestrictNamespaces=no + +[Install] +WantedBy= +WantedBy=multi-user.target From 689480b7300f51f87eae04581f92ed961445c0ea Mon Sep 17 00:00:00 2001 From: Nathaniel van Diepen Date: Mon, 11 Dec 2023 20:43:34 -0700 Subject: [PATCH 05/10] lint fix --- package/libglib/package | 4 ++-- package/libgudev/package | 4 ++-- package/upower/package | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package/libglib/package b/package/libglib/package index d534c62f8..483925a96 100644 --- a/package/libglib/package +++ b/package/libglib/package @@ -11,7 +11,7 @@ maintainer="Eeems " license=GPL-2.0-or-later _glib_ver=2.78.3 pkgver=${_glib_ver}-1 -source=(https://download.gnome.org/sources/glib/2.78/glib-${_glib_ver}.tar.xz) +source=("https://download.gnome.org/sources/glib/2.78/glib-${_glib_ver}.tar.xz") sha256sums=(609801dd373796e515972bf95fc0b2daa44545481ee2f465c4f204d224b2bc21) image=base:v3.1 makedepends=(build:git) @@ -37,5 +37,5 @@ build() { } package() { - cp -al "${srcdir}/installdir/." ${pkgdir} + cp -al "${srcdir}/installdir/." "${pkgdir}" } diff --git a/package/libgudev/package b/package/libgudev/package index fa3ca4951..2093b958b 100644 --- a/package/libgudev/package +++ b/package/libgudev/package @@ -11,7 +11,7 @@ maintainer="Eeems " license=GPL-2.0-or-later _libgudev_ver=237 pkgver=${_libgudev_ver}-1 -source=(https://download.gnome.org/sources/libgudev/${_libgudev_ver}/libgudev-${_libgudev_ver}.tar.xz) +source=("https://download.gnome.org/sources/libgudev/${_libgudev_ver}/libgudev-${_libgudev_ver}.tar.xz") sha256sums=(0d06b21170d20c93e4f0534dbb9b0a8b4f1119ffb00b4031aaeb5b9148b686aa) image=base:v3.1 makedepends=( @@ -30,5 +30,5 @@ build() { } package() { - cp -al "${srcdir}/installdir/." ${pkgdir} + cp -al "${srcdir}/installdir/." "${pkgdir}" } diff --git a/package/upower/package b/package/upower/package index 8306ada05..14e8298db 100644 --- a/package/upower/package +++ b/package/upower/package @@ -12,7 +12,7 @@ license=GPL-2.0-or-later _upower_ver=1.90.1 pkgver=${_upower_ver}-1 source=( - https://gitlab.freedesktop.org/upower/upower/-/archive/v${_upower_ver}/upower-v${_upower_ver}.zip + "https://gitlab.freedesktop.org/upower/upower/-/archive/v${_upower_ver}/upower-v${_upower_ver}.zip" upower-toltec.conf ) sha256sums=( @@ -48,7 +48,7 @@ build() { } package() { - cp -al "${srcdir}/installdir/." ${pkgdir} + cp -al "${srcdir}/installdir/." "${pkgdir}" mkdir -p "${pkgdir}/etc/systemd/system/upower.service.d" cp "${srcdir}/upower-toltec.conf" "${pkgdir}/etc/systemd/system/upower.service.d/" patchelf \ From 23415fe39b28da381d43f4f12f616a0a720b604a Mon Sep 17 00:00:00 2001 From: Nathaniel van Diepen Date: Mon, 8 Apr 2024 19:01:11 -0600 Subject: [PATCH 06/10] Update package --- package/upower/package | 1 + 1 file changed, 1 insertion(+) diff --git a/package/upower/package b/package/upower/package index 14e8298db..a55912244 100644 --- a/package/upower/package +++ b/package/upower/package @@ -27,6 +27,7 @@ makedepends=( host:libglib host:libgudev ) +installdepends=(libgudev) build() { # Workaround https://github.com/toltec-dev/toolchain/issues/33 From d8c388ddc58ba6fac1b3dd58d94ba548d566c990 Mon Sep 17 00:00:00 2001 From: Nathaniel van Diepen Date: Mon, 8 Apr 2024 19:01:25 -0600 Subject: [PATCH 07/10] Update package --- package/libgudev/package | 1 + 1 file changed, 1 insertion(+) diff --git a/package/libgudev/package b/package/libgudev/package index 2093b958b..2e35c4c9b 100644 --- a/package/libgudev/package +++ b/package/libgudev/package @@ -18,6 +18,7 @@ makedepends=( build:libglib2.0 host:libglib ) +installdepends=(libglib) build() { export PKG_CONFIG_LIBDIR="$PKG_CONFIG_LIBDIR:$PKG_CONFIG_SYSROOT_DIR/opt/usr/lib/libglib/lib/pkgconfig" From 4b5d7d32d703fcd6851d30a5765e2cdf9e5531b7 Mon Sep 17 00:00:00 2001 From: Nathaniel van Diepen Date: Wed, 8 May 2024 13:40:47 -0600 Subject: [PATCH 08/10] Update toltec-base version --- package/toltec-base/package | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/toltec-base/package b/package/toltec-base/package index b3088f88b..9fcf2da71 100644 --- a/package/toltec-base/package +++ b/package/toltec-base/package @@ -6,7 +6,7 @@ archs=(rmall rmallos2 rmallos3 rm1 rm1os2 rm1os3 rm2 rm2os2 rm2os3) pkgnames=(toltec-base) pkgdesc="Metapackage defining the base set of packages in a Toltec install" url=https://toltec-dev.org/ -pkgver=1.3-2 +pkgver=1.4-1 timestamp=2023-12-27T08:30Z section="utils" maintainer="Eeems " From 1f74b9310b8d4387be169e8495982a0623385812 Mon Sep 17 00:00:00 2001 From: Nathaniel van Diepen Date: Sat, 14 Sep 2024 11:27:40 -0600 Subject: [PATCH 09/10] Update package --- package/libgudev/package | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/libgudev/package b/package/libgudev/package index 2e35c4c9b..8a61a4104 100644 --- a/package/libgudev/package +++ b/package/libgudev/package @@ -13,7 +13,7 @@ _libgudev_ver=237 pkgver=${_libgudev_ver}-1 source=("https://download.gnome.org/sources/libgudev/${_libgudev_ver}/libgudev-${_libgudev_ver}.tar.xz") sha256sums=(0d06b21170d20c93e4f0534dbb9b0a8b4f1119ffb00b4031aaeb5b9148b686aa) -image=base:v3.1 +image=base:v3.2 makedepends=( build:libglib2.0 host:libglib From 9f97695f897813db2e3fd2dcd8db86d22c85bf33 Mon Sep 17 00:00:00 2001 From: Nathaniel van Diepen Date: Sat, 14 Sep 2024 11:28:05 -0600 Subject: [PATCH 10/10] Update package --- package/upower/package | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/upower/package b/package/upower/package index a55912244..7cb2203f2 100644 --- a/package/upower/package +++ b/package/upower/package @@ -19,7 +19,7 @@ sha256sums=( cba3cea3ae4cd345a4d7a787a47e20b35af00859b7089de5aab4796df406fe00 SKIP ) -image=base:v3.1 +image=base:v3.2 makedepends=( build:gtk-doc-tools build:libglib2.0