From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 92D1C139694 for ; Sun, 12 Mar 2017 04:41:28 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id BD35AE0D1F; Sun, 12 Mar 2017 04:41:26 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 8D599E0D1F for ; Sun, 12 Mar 2017 04:41:26 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 0B215340E75 for ; Sun, 12 Mar 2017 04:41:25 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 779D36533 for ; Sun, 12 Mar 2017 04:41:23 +0000 (UTC) From: "Mike Frysinger" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Frysinger" Message-ID: <1489293421.7c558088fc8b3e4bf28ded33509ad971e72c8a4e.vapier@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/busybox/files/, sys-apps/busybox/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-apps/busybox/busybox-1.26.2.ebuild sys-apps/busybox/busybox-9999.ebuild sys-apps/busybox/files/klogd.initd sys-apps/busybox/files/ntpd.initd sys-apps/busybox/files/syslogd.initd sys-apps/busybox/files/watchdog.initd X-VCS-Directories: sys-apps/busybox/files/ sys-apps/busybox/ X-VCS-Committer: vapier X-VCS-Committer-Name: Mike Frysinger X-VCS-Revision: 7c558088fc8b3e4bf28ded33509ad971e72c8a4e X-VCS-Branch: master Date: Sun, 12 Mar 2017 04:41:23 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 0a4e2d2e-4d91-49df-9ae2-2397e0464a54 X-Archives-Hash: f378b049a1283fb9d20e158721b0bed9 commit: 7c558088fc8b3e4bf28ded33509ad971e72c8a4e Author: Mike Frysinger gentoo org> AuthorDate: Sun Mar 12 04:37:01 2017 +0000 Commit: Mike Frysinger gentoo org> CommitDate: Sun Mar 12 04:37:01 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7c558088 sys-apps/busybox: migrate to /run sys-apps/busybox/busybox-1.26.2.ebuild | 19 ++++++++++++------- sys-apps/busybox/busybox-9999.ebuild | 19 ++++++++++++------- sys-apps/busybox/files/klogd.initd | 2 +- sys-apps/busybox/files/ntpd.initd | 2 +- sys-apps/busybox/files/syslogd.initd | 2 +- sys-apps/busybox/files/watchdog.initd | 2 +- 6 files changed, 28 insertions(+), 18 deletions(-) diff --git a/sys-apps/busybox/busybox-1.26.2.ebuild b/sys-apps/busybox/busybox-1.26.2.ebuild index 3d4a6cee553..af2ec1b08ef 100644 --- a/sys-apps/busybox/busybox-1.26.2.ebuild +++ b/sys-apps/busybox/busybox-1.26.2.ebuild @@ -36,17 +36,19 @@ S=${WORKDIR}/${MY_P} busybox_config_option() { local flag=$1 ; shift - if [[ ${flag} != [yn] ]] ; then + if [[ ${flag} != [yn] && ${flag} != \"* ]] ; then busybox_config_option $(usex ${flag} y n) "$@" return fi + local expr while [[ $# -gt 0 ]] ; do - if [[ ${flag} == "y" ]] ; then - sed -i -e "s:.*\.*set:CONFIG_$1=y:g" .config - else - sed -i -e "s:CONFIG_$1=y:# CONFIG_$1 is not set:g" .config - fi - einfo $(grep "CONFIG_$1[= ]" .config || echo Could not find CONFIG_$1 ...) + case ${flag} in + y) expr="s:.*\.*set:CONFIG_$1=y:g" ;; + n) expr="s:CONFIG_$1=y:# CONFIG_$1 is not set:g" ;; + *) expr="s:.*\.*:CONFIG_$1=${flag}:g" ;; + esac + sed -i -e "${expr}" .config || die + einfo "$(grep "CONFIG_$1[= ]" .config || echo "Could not find CONFIG_$1 ...")" shift done } @@ -125,6 +127,9 @@ src_configure() { busybox_config_option y ASH busybox_config_option n HUSH + busybox_config_option '"/run"' PID_FILE_PATH + busybox_config_option '"/run/ifstate"' IFUPDOWN_IFSTATE_PATH + # disable ipv6 applets if ! use ipv6; then busybox_config_option n FEATURE_IPV6 diff --git a/sys-apps/busybox/busybox-9999.ebuild b/sys-apps/busybox/busybox-9999.ebuild index 3d4a6cee553..af2ec1b08ef 100644 --- a/sys-apps/busybox/busybox-9999.ebuild +++ b/sys-apps/busybox/busybox-9999.ebuild @@ -36,17 +36,19 @@ S=${WORKDIR}/${MY_P} busybox_config_option() { local flag=$1 ; shift - if [[ ${flag} != [yn] ]] ; then + if [[ ${flag} != [yn] && ${flag} != \"* ]] ; then busybox_config_option $(usex ${flag} y n) "$@" return fi + local expr while [[ $# -gt 0 ]] ; do - if [[ ${flag} == "y" ]] ; then - sed -i -e "s:.*\.*set:CONFIG_$1=y:g" .config - else - sed -i -e "s:CONFIG_$1=y:# CONFIG_$1 is not set:g" .config - fi - einfo $(grep "CONFIG_$1[= ]" .config || echo Could not find CONFIG_$1 ...) + case ${flag} in + y) expr="s:.*\.*set:CONFIG_$1=y:g" ;; + n) expr="s:CONFIG_$1=y:# CONFIG_$1 is not set:g" ;; + *) expr="s:.*\.*:CONFIG_$1=${flag}:g" ;; + esac + sed -i -e "${expr}" .config || die + einfo "$(grep "CONFIG_$1[= ]" .config || echo "Could not find CONFIG_$1 ...")" shift done } @@ -125,6 +127,9 @@ src_configure() { busybox_config_option y ASH busybox_config_option n HUSH + busybox_config_option '"/run"' PID_FILE_PATH + busybox_config_option '"/run/ifstate"' IFUPDOWN_IFSTATE_PATH + # disable ipv6 applets if ! use ipv6; then busybox_config_option n FEATURE_IPV6 diff --git a/sys-apps/busybox/files/klogd.initd b/sys-apps/busybox/files/klogd.initd index 5c816e69ad7..95d5eb030d5 100644 --- a/sys-apps/busybox/files/klogd.initd +++ b/sys-apps/busybox/files/klogd.initd @@ -4,7 +4,7 @@ command="/bin/busybox klogd" command_args="${KLOGD_OPTS}" -pidfile="/var/run/klogd.pid" +pidfile="/run/klogd.pid" depend() { need clock hostname diff --git a/sys-apps/busybox/files/ntpd.initd b/sys-apps/busybox/files/ntpd.initd index 4bc2011f4bb..dffea3bcde3 100644 --- a/sys-apps/busybox/files/ntpd.initd +++ b/sys-apps/busybox/files/ntpd.initd @@ -4,7 +4,7 @@ command="/bin/busybox ntpd" command_args="${NTPD_OPTS}" -pidfile="/var/run/ntpd.pid" +pidfile="/run/ntpd.pid" depend() { use net dns logger diff --git a/sys-apps/busybox/files/syslogd.initd b/sys-apps/busybox/files/syslogd.initd index a4a7c99374d..b2ac5ac1722 100644 --- a/sys-apps/busybox/files/syslogd.initd +++ b/sys-apps/busybox/files/syslogd.initd @@ -4,7 +4,7 @@ command="/bin/busybox syslogd" command_args="${SYSLOGD_OPTS}" -pidfile="/var/run/syslogd.pid" +pidfile="/run/syslogd.pid" depend() { need clock hostname diff --git a/sys-apps/busybox/files/watchdog.initd b/sys-apps/busybox/files/watchdog.initd index 6f71e26cfc3..89043738a7e 100644 --- a/sys-apps/busybox/files/watchdog.initd +++ b/sys-apps/busybox/files/watchdog.initd @@ -4,4 +4,4 @@ command="/bin/busybox watchdog" command_args="${WATCHDOG_OPTS}" -pidfile="/var/run/watchdog.pid" +pidfile="/run/watchdog.pid"