Christian Hesse pushed to branch main at Arch Linux / Packaging / Packages / systemd
Commits: 6211336f by Christian Hesse at 2023-12-13T12:19:51+01:00 fix the commit id in dc019e565bad32976cecd42aa4d7c786ff503c03 🤪 - - - - - 567c387e by Christian Hesse at 2023-12-13T12:28:25+01:00 fix path for ukify installation ... and unbreak c3904582233f6d7e0346f44e56ced02e8f39a8eb - - - - - a559356a by nl6720 at 2023-12-13T12:37:41+01:00 Conflict with "resolvconf" instead of "openresolv" Only one resolvconf implementation can be installed at a time. This should be deployed together with https://gitlab.archlinux.org/archlinux/packaging/packages/openresolv/-/merge_requests/1 Related to https://gitlab.archlinux.org/archlinux/packaging/packages/systemd/-/issues/12 - - - - - 1082c555 by Christian Hesse at 2023-12-13T12:45:03+01:00 upgpkg: 255-2: recent changes - - - - - 2 changed files: - .SRCINFO - PKGBUILD Changes: ===================================== .SRCINFO ===================================== @@ -1,6 +1,6 @@ pkgbase = systemd pkgver = 255 - pkgrel = 1 + pkgrel = 2 url = https://www.github.com/systemd/systemd arch = x86_64 checkdepends = python-pefile @@ -198,7 +198,7 @@ pkgname = systemd-resolvconf depends = systemd provides = openresolv provides = resolvconf - conflicts = openresolv + conflicts = resolvconf pkgname = systemd-sysvcompat pkgdesc = sysvinit compat for systemd ===================================== PKGBUILD ===================================== @@ -9,7 +9,7 @@ pkgname=('systemd' _tag='0966fe6734417ce07d5eb82a245fdec3789714da' # git rev-parse v${_tag_name} _tag_name=255 pkgver="${_tag_name/-/}" -pkgrel=1 +pkgrel=2 arch=('x86_64') url='https://www.github.com/systemd/systemd' makedepends=('acl' 'cryptsetup' 'docbook-xsl' 'gperf' 'lz4' 'xz' 'pam' 'libelf' @@ -77,7 +77,7 @@ _backports=( # network/networkd-address: don't set up firewall rules here '58c6e75f263a1562f5550221af1ec1a9b6046143' # core: do not make private /dev/ read-only too soon - 'b0cb93591096b23f1cb3b81825824e11609c1833' + 'ae7482b994e6a9bc8e033de9accd24b1e1ffe2ed' ) _reverts=( @@ -304,7 +304,7 @@ package_systemd-resolvconf() { license=('LGPL2.1') depends=('systemd') provides=('openresolv' 'resolvconf') - conflicts=('openresolv') + conflicts=('resolvconf') install -d -m0755 "$pkgdir"/usr/bin ln -s resolvectl "$pkgdir"/usr/bin/resolvconf @@ -341,7 +341,7 @@ package_systemd-ukify() { mv systemd-ukify/bin "$pkgdir"/usr/bin mv systemd-ukify/systemd "$pkgdir"/usr/lib/systemd mv systemd-ukify/man1 "$pkgdir"/usr/share/man/man1 - mv systemd-ukify/lib/kernel/install.d "$pkgdir"/usr/lib/kernel/install.d + mv systemd-ukify/install.d "$pkgdir"/usr/lib/kernel/install.d } # vim:ft=sh syn=sh et sw=2: View it on GitLab: https://gitlab.archlinux.org/archlinux/packaging/packages/systemd/-/compare/dc019e565bad32976cecd42aa4d7c786ff503c03...1082c555b1a31b5c163b1957d79400261d1ad682 -- View it on GitLab: https://gitlab.archlinux.org/archlinux/packaging/packages/systemd/-/compare/dc019e565bad32976cecd42aa4d7c786ff503c03...1082c555b1a31b5c163b1957d79400261d1ad682 You're receiving this email because of your account on gitlab.archlinux.org.
