summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorA. Wilcox <AWilcox@Wilcox-Tech.com>2023-10-02 01:04:56 -0500
committerA. Wilcox <AWilcox@Wilcox-Tech.com>2023-10-03 21:56:53 -0500
commit1f7625b8c83e3c5a3623b59a59f62a5e4f30cbc5 (patch)
treeb35d264295bf294c4ee17af8327e9a893aa599fa
parentb2d2672c057e8f5d802f4d89662c871b2429e777 (diff)
downloadpackages-1f7625b8c83e3c5a3623b59a59f62a5e4f30cbc5.tar.gz
packages-1f7625b8c83e3c5a3623b59a59f62a5e4f30cbc5.tar.bz2
packages-1f7625b8c83e3c5a3623b59a59f62a5e4f30cbc5.tar.xz
packages-1f7625b8c83e3c5a3623b59a59f62a5e4f30cbc5.zip
system/openrc: Silence grep pattern warning
Fixes: #1046
-rw-r--r--system/openrc/APKBUILD4
-rw-r--r--system/openrc/hwclock-grep.patch15
2 files changed, 18 insertions, 1 deletions
diff --git a/system/openrc/APKBUILD b/system/openrc/APKBUILD
index 97c7a3923..5546e46be 100644
--- a/system/openrc/APKBUILD
+++ b/system/openrc/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer:
pkgname=openrc
pkgver=0.24.1
-pkgrel=11
+pkgrel=12
pkgdesc="OpenRC manages the services, startup and shutdown of a host"
url="https://github.com/OpenRC/openrc"
arch="all"
@@ -19,6 +19,7 @@ source="$pkgname-$pkgver.tar.gz::https://github.com/OpenRC/openrc/archive/$pkgve
0004-hide-error-when-migrating-var-run-to-run.patch
0005-rc-pull-in-sysinit-and-boot-as-stacked-levels-when-n.patch
0006-mount-efivars-read-only.patch
+ hwclock-grep.patch
openrc-configuration.patch
@@ -88,6 +89,7 @@ aedf77f9159fefb4bd5f30a29a33b6aedbc986c9a0f993aa928cc79fbe24aac76bd9e5974dcce52e
d54630d40a2d6b10a325cb012d4efcda997a60c008ca953ce5d60059d3f267308a59dabddf93a5fc0d301aa91967137d144effbe5f574394af768ce4ebc48738 0004-hide-error-when-migrating-var-run-to-run.patch
39a35c54ec9112fe84c901ed155a711cec8e194af02d5483ee60b80743dab12391e6fdc7b3da2f86844dd4edcf53e681ff95bd4d6fa1101a89ce54dce2ddbb7c 0005-rc-pull-in-sysinit-and-boot-as-stacked-levels-when-n.patch
7221dd2daccd8844f6f9481b7b5921abc2711c8abd1a4bb72f04db8fd8e734b817f5d0d571daea0e2e05d3bc687f75ee1d8025249996bdee0b3328e18d9da7d3 0006-mount-efivars-read-only.patch
+43355d72ad82858787e240450ae556cdd40aa9a3719545991d76719df80cc5c851c21374b339a6953f0344f1468e08e99c4da11334dc0b72647f4aa1db08558c hwclock-grep.patch
634c09a36d542a69b147a292418fa99a5d071d7a384bd2d2b30917a986cdc82ef4e96e380bc3a154cb0709c57d5308320c30fd6973972d6e6d7f8ac5b2e31bea openrc-configuration.patch
12bb6354e808fbf47bbab963de55ee7901738b4a912659982c57ef2777fff9a670e867fcb8ec316a76b151032c92dc89a950d7d1d835ef53f753a8f3b41d2cec openrc.logrotate
99b542c0903ad6874b8c308b2e0660a4fe2ff9db962dfec65325cd12c368873a2ae800d5e6d42dc4deff775e1d5c0068869eb72581f7ab16e88d5738afe1d3dd hostname.initd
diff --git a/system/openrc/hwclock-grep.patch b/system/openrc/hwclock-grep.patch
new file mode 100644
index 000000000..2d25a486a
--- /dev/null
+++ b/system/openrc/hwclock-grep.patch
@@ -0,0 +1,15 @@
+Silence warning about pattern.
+
+Ref: https://git.adelielinux.org/adelie/packages/-/issues/1046
+
+--- openrc-0.24.1/init.d/hwclock.in.old 2017-03-14 19:58:26.000000000 -0500
++++ openrc-0.24.1/init.d/hwclock.in 2023-10-02 01:02:49.249806693 -0500
+@@ -75,7 +75,7 @@
+ {
+ if ! yesno $clock_adjfile; then
+ # Some implementations don't handle adjustments
+- if LC_ALL=C hwclock --help 2>&1 | grep -q "\-\-noadjfile"; then
++ if LC_ALL=C hwclock --help 2>&1 | grep -q "\--noadjfile"; then
+ echo --noadjfile
+ fi
+ fi