Disabling systemd via meson option now; upstream version bump.

3 files changed, 15 insertions, 42 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d70f48ca9abe..9febe4b4ec5d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = uksmd-nosystemd-git
 	pkgdesc = Userspace KSM helper daemon. Without systemd dependency, latest git checkout.
-	pkgver = 6.4.1.r67.20230707.b698d76
-	pkgrel = 8
+	pkgver = 6.5.1.r72.20230906.ec2bfd8
+	pkgrel = 1
 	epoch = 0
 	url = https://codeberg.org/pf-kernel/uksmd
 	arch = aarch64
@@ -18,13 +18,11 @@ pkgbase = uksmd-nosystemd-git
 	optdepends = uksmdstats: For statistics information output.
 	optdepends = uksmd-openrc: For OpenRC initscript.
 	optdepends = UKSMD-BUILTIN: Necessary kernel support.
-	provides = uksmd=6.4.1.r67.20230707.b698d76
-	provides = uksmd-nosystemd=6.4.1.r67.20230707.b698d76
-	provides = uksmd-git=6.4.1.r67.20230707.b698d76
+	provides = uksmd=6.5.1.r72.20230906.ec2bfd8
+	provides = uksmd-nosystemd=6.5.1.r72.20230906.ec2bfd8
+	provides = uksmd-git=6.5.1.r72.20230906.ec2bfd8
 	conflicts = uksmd
 	source = uksmd-natalenko::git+https://codeberg.org/pf-kernel/uksmd.git
-	source = disable_systemd_build.patch
 	sha256sums = SKIP
-	sha256sums = 0bf8c5f13e0a4537993a7c3de2933ce22c6f22332f08e505c6403dd39d3340b0
 
 pkgname = uksmd-nosystemd-git
diff --git a/PKGBUILD b/PKGBUILD
index 6f30b4088be3..2392ffa350f9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,8 +8,8 @@ _pkgname=uksmd
 _downloadname="${_pkgname}-natalenko"
 pkgname="${_pkgname}-nosystemd-git"
 epoch=0
-pkgver=6.4.1.r67.20230707.b698d76
-pkgrel=8
+pkgver=6.5.1.r72.20230906.ec2bfd8
+pkgrel=1
 pkgdesc="Userspace KSM helper daemon. Without systemd dependency, latest git checkout."
 url=https://codeberg.org/pf-kernel/uksmd
 license=(GPL3)
@@ -44,19 +44,17 @@ conflicts=(
 )
 source=(
   "${_downloadname}::git+${url}.git"
-  'disable_systemd_build.patch'
 )
 sha256sums=(
   'SKIP'
-  '0bf8c5f13e0a4537993a7c3de2933ce22c6f22332f08e505c6403dd39d3340b0'
 )
 
 prepare() {
-  cd "${srcdir}/${_downloadname}"
+  cd "${srcdir}"
+  mkdir -p build
 
+  cd "${srcdir}/${_downloadname}"
   git log > git.log
-
-  patch -Np1 --follow-symlinks -i "${srcdir}/disable_systemd_build.patch"
 }
 
 pkgver() {
@@ -76,17 +74,19 @@ pkgver() {
 }
 
 build() {
-  cd "${srcdir}/${_downloadname}"
+  cd "${srcdir}"
 
-  arch-meson . build
+  arch-meson -Dsystemd=disabled "${_downloadname}" build
   meson compile -C build
 }
 
 package() {
-  cd "${srcdir}/${_downloadname}"
+  cd "${srcdir}"
 
   meson install -C build --destdir "${pkgdir}"
 
+  cd "${srcdir}/${_downloadname}"
+
   install -Dvm644 git.log "${pkgdir}/usr/share/doc/${_pkgname}/git.log"
   install -Dvm644 README.md "${pkgdir}/usr/share/doc/${_pkgname}/README.md"
   install -Dvm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING"
diff --git a/disable_systemd_build.patch b/disable_systemd_build.patch
deleted file mode 100644
index e77947fd21f1..000000000000
--- a/disable_systemd_build.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff -rU0 uksmd.orig/meson.build uksmd-nosystemd/meson.build
---- uksmd.orig/meson.build	2023-07-13 15:23:27.810351749 +0200
-+++ uksmd-nosystemd/meson.build	2023-07-13 15:54:01.630009663 +0200
-@@ -21,21 +20,0 @@
--systemd = dependency('systemd', required: false)
--
--if systemd.found()
--  systemd_system_unit_dir = systemd.get_variable(pkgconfig : 'systemdsystemunitdir')
--
--  install_data(
--    [
--      'uksmd.service',
--    ],
--    install_dir: systemd_system_unit_dir
--  )
--
--  project_dependencies += [
--    dependency('libsystemd')
--  ]
--
--  build_args += [
--    '-DHAVE_SYSTEMD',
--  ]
--endif
--