diff options
Diffstat (limited to 'libre/systemd/PKGBUILD')
| -rw-r--r-- | libre/systemd/PKGBUILD | 60 |
1 files changed, 17 insertions, 43 deletions
diff --git a/libre/systemd/PKGBUILD b/libre/systemd/PKGBUILD index de2288ef1..8db21a0cc 100644 --- a/libre/systemd/PKGBUILD +++ b/libre/systemd/PKGBUILD @@ -12,9 +12,9 @@ pkgname+=('systemd-common' 'systemd-udev') _systemd_libs=('libsystemd' 'libudev' 'nss-systemd' 'nss-myhostname' 'nss-mymachines' 'nss-resolve') pkgname+=("${_systemd_libs[@]/#/systemd-}") # Can be from either systemd or systemd-stable -_commit='9d34e79ae8ef891adf3757f9248566def70471ad' -pkgver=242.84 -pkgrel=2 +_commit='efb536d0cbe2e58f80e501d19999928c75e08f6a' +pkgver=243.0 +pkgrel=1 pkgrel+=.par1 arch=('x86_64') arch+=('i686' 'armv7h' 'ppc64le') @@ -44,14 +44,14 @@ source=(# fragment is latest tag for source verification, final merge in prepare 'systemd-hook' '20-systemd-sysusers.hook' 'udev-hook' - 'systemd-binfmt.hook' - 'systemd-catalog.hook' - 'systemd-daemon-reload.hook' - 'systemd-hwdb.hook' - 'systemd-sysctl.hook' - 'systemd-tmpfiles.hook' - 'systemd-udev-reload.hook' - 'systemd-update.hook' + '30-systemd-binfmt.hook' + '30-systemd-catalog.hook' + '30-systemd-daemon-reload.hook' + '30-systemd-hwdb.hook' + '30-systemd-sysctl.hook' + '30-systemd-tmpfiles.hook' + '30-systemd-udev-reload.hook' + '30-systemd-update.hook' '0001-FSDG-man-Refer-to-the-operating-system-as-GNU-Linux.patch' '0002-FSDG-os-release-Default-PRETTY_NAME-to-GNU-Linux-ins.patch' '0003-FSDG-os-release-Default-NAME-to-GNU-Linux-instead-of.patch' @@ -81,38 +81,14 @@ sha512sums=('SKIP' 'c4463fdd25e14a836ac3b874109861a55a0169c4206b6356b53974dd4621f645652087ebf4c738b18734a718fe7fd9ec6b700ce8dd9736525274eb16b10385e6' '209b01b044877cc986757fa4009a92ea98f480306c2530075d153203c3cd2b3afccab6aacc1453dee8857991e04270572f1700310705d7a0f4d5bed27fab8c67' '83a00469c63f9cdb069264209e545bddce0abc0024339bbc271d8ecb249fdabb984c0f4e4ab52d84e8ec03d2c6d9b3106f3d880c218d806cbe7a76a74c4d0908' - 'e1e45c17f1087bb73ff8acbbbb85b2b36e87499e9362dce74486f353523e54049d5dfa1ffe8b0a2be3b743c3a37721c7a47f8a71cc29e07a589f5f4efe4290df' + 'f8ad54b5fcc8c4e37fbcd364bbf5eafced8db3f2a362ed29b04e1ff67001cedbd4f91cc0e4a9ae143be8d1191902bcc35a48a624ffd45ed1a4bd57df389d4cc4' 'fd0df3d365892d4d461a78bb0b728201e81c1269af07a38e134fadfc0ffb29aade7642142d128abcf88803b86494d7629ff5990359ef067feea3d476c7238a67' 'e9e884015a40dc796fd8cbd8f79b3b9eebc7e48a332b22d52104c21c492be9982b35b7dd30bc29f2c2d274707ffd043eda059659844a4cd50eb433b8a3f7648c' '0d6b894149ec8d0612d1be1dee5daa1768345232e450435ddc750e36a8309dd96782a92f0220169c69103b1c4632af708e4a737cb7ba817944c92dcb61379a30' - 'cf0dd60f56160f6add80ecebf698632bde55ed25e54ffa6cd0fa18da4aa2d446d3e4394295446555db22d32bf3b5f563c7e77a52eeb342a8ddaabd1347032e83' + '604aed271116ed263287ef9227185a277d60c7f555bb7b06315fdcc1ed74e6c655011a8205a9eb2c4fce39ac065e0b4b81084d4375b472467396cca7032bf0b7' '28a5b3fc9e2c5cec9267bb96725c73ee77788514f140c0cf8df765af64bc8130dd02f4863d9128ac45d54256b2ab4f2b06d1a3f65660ce1dfba5727618cd1839') _backports=( - # basic/socket-util: put a limit on the loop to flush connections - '67962036f6c6cfd34828c1f1f1fbdc0018fb9898' - - # network: logs link state change - '0beb9542e90ab1c5d1507a1046a326fbcf73861c' - - # network: drop invalid assertion - '51aba17b88617515e037e8985d3a4ea871ac47fe' - # network: fix assertion when link get carrier - 'b9ea3d2e47b3741f3f46ba9c5e19640136933b71' - - # network: do not use ordered_set_printf() for DOMAINS= or ROUTE_DOMAINS= - 'fe0e16db093a7da09fcb52a2bc7017197047443d' - - # network: honor MTUBytes= setting - '933c70a0a4e4fac47d18e0348ae97ee3d48dc139' - # network: bump MTU bytes only when MTUByte= is not set - 'f6fcc1c2a41eae749467de58453174296b635a69' - - # network: do not send ipv6 token to kernel - '9f6e82e6eb3b6e73d66d00d1d6eee60691fb702f' - - # cgroup-util: kill also threads - 'e48fcfef06d81bf08607d3c1657fdc6aa1e9a6ee' ) _reverts=( @@ -184,6 +160,7 @@ build() { -Dima=false -Dlibidn2=true -Dlz4=true + -Dman=true -Ddbuspolicydir=/usr/share/dbus-1/system.d -Ddefault-hierarchy=hybrid @@ -286,10 +263,6 @@ package_systemd() { cp -rT -d --no-preserve=ownership,timestamp "$srcdir/dest/$pkgname" "$pkgdir" - # don't write units to /etc by default. some of these will be re-enabled on - # post_install. - rm -rv "$pkgdir"/etc/systemd/system/* - # we'll create this on installation rmdir "$pkgdir"/var/log/journal/remote @@ -300,8 +273,9 @@ package_systemd() { rm "$pkgdir"/usr/{bin/resolvconf,share/man/man1/resolvconf.1} # avoid a potential conflict with [core]/filesystem - rm "$pkgdir"/usr/share/factory/etc/nsswitch.conf - sed -i '/^C \/etc\/nsswitch\.conf/d' "$pkgdir"/usr/lib/tmpfiles.d/etc.conf + rm "$pkgdir"/usr/share/factory/etc/{issue,nsswitch.conf} + sed -i -e '/^C \/etc\/nsswitch\.conf/d' \ + -e '/^C \/etc\/issue/d' "$pkgdir"/usr/lib/tmpfiles.d/etc.conf # add back tmpfiles.d/legacy.conf, normally omitted without sysv-compat install -m0644 $pkgbase-stable/tmpfiles.d/legacy.conf "$pkgdir"/usr/lib/tmpfiles.d |