Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Mike Frysinger (vapier)" <vapier@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in sys-apps/busybox: busybox-1.21.0.ebuild busybox-9999.ebuild ChangeLog
Date: Wed, 27 Feb 2013 05:44:05
Message-Id: 20130227054401.967DB2171D@flycatcher.gentoo.org
1 vapier 13/02/27 05:44:01
2
3 Modified: busybox-1.21.0.ebuild busybox-9999.ebuild ChangeLog
4 Log:
5 Install the udhcp config files when features are enabled.
6
7 (Portage version: 2.2.0_alpha163/cvs/Linux x86_64, signed Manifest commit with key FB7C4156)
8
9 Revision Changes Path
10 1.7 sys-apps/busybox/busybox-1.21.0.ebuild
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/busybox/busybox-1.21.0.ebuild?rev=1.7&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/busybox/busybox-1.21.0.ebuild?rev=1.7&content-type=text/plain
14 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/busybox/busybox-1.21.0.ebuild?r1=1.6&r2=1.7
15
16 Index: busybox-1.21.0.ebuild
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-1.21.0.ebuild,v
19 retrieving revision 1.6
20 retrieving revision 1.7
21 diff -u -r1.6 -r1.7
22 --- busybox-1.21.0.ebuild 19 Feb 2013 01:42:39 -0000 1.6
23 +++ busybox-1.21.0.ebuild 27 Feb 2013 05:44:01 -0000 1.7
24 @@ -1,6 +1,6 @@
25 # Copyright 1999-2013 Gentoo Foundation
26 # Distributed under the terms of the GNU General Public License v2
27 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-1.21.0.ebuild,v 1.6 2013/02/19 01:42:39 zmedico Exp $
28 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-1.21.0.ebuild,v 1.7 2013/02/27 05:44:01 vapier Exp $
29
30 # See `man savedconfig.eclass` for info on how to use USE=savedconfig.
31
32 @@ -51,7 +51,12 @@
33 }
34
35 busybox_config_enabled() {
36 - grep "^CONFIG_$1=y" -q .config
37 + local val=$(sed -n "/^CONFIG_$1=/s:^[^=]*=::p" .config)
38 + case ${val} in
39 + "") return 1 ;;
40 + y) return 0 ;;
41 + *) echo "${val}" | sed -r 's:^"(.*)"$:\1:' ;;
42 + esac
43 }
44
45 src_prepare() {
46 @@ -61,7 +66,7 @@
47
48 # patches go here!
49 epatch "${FILESDIR}"/${PN}-1.19.0-bb.patch
50 - epatch "${FILESDIR}"/${P}-*.patch
51 + #epatch "${FILESDIR}"/${P}-*.patch
52 cp "${FILESDIR}"/ginit.c init/ || die
53
54 # flag cleanup
55 @@ -224,6 +229,15 @@
56 newconfd "${FILESDIR}/watchdog.confd" "busybox-watchdog"
57 newinitd "${FILESDIR}/watchdog.initd" "busybox-watchdog"
58 fi
59 + if busybox_config_enabled UDHCPC; then
60 + local path=$(busybox_config_enabled UDHCPC_DEFAULT_SCRIPT)
61 + insinto "${path%/*}"
62 + newins examples/udhcp/simple.script "${path##*/}"
63 + fi
64 + if busybox_config_enabled UDHCPD; then
65 + insinto /etc
66 + doins examples/udhcp/udhcpd.conf
67 + fi
68
69 # bundle up the symlink files for use later
70 emake DESTDIR="${ED}" install
71
72
73
74 1.13 sys-apps/busybox/busybox-9999.ebuild
75
76 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/busybox/busybox-9999.ebuild?rev=1.13&view=markup
77 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/busybox/busybox-9999.ebuild?rev=1.13&content-type=text/plain
78 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/busybox/busybox-9999.ebuild?r1=1.12&r2=1.13
79
80 Index: busybox-9999.ebuild
81 ===================================================================
82 RCS file: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-9999.ebuild,v
83 retrieving revision 1.12
84 retrieving revision 1.13
85 diff -u -r1.12 -r1.13
86 --- busybox-9999.ebuild 19 Feb 2013 01:42:39 -0000 1.12
87 +++ busybox-9999.ebuild 27 Feb 2013 05:44:01 -0000 1.13
88 @@ -1,6 +1,6 @@
89 # Copyright 1999-2013 Gentoo Foundation
90 # Distributed under the terms of the GNU General Public License v2
91 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-9999.ebuild,v 1.12 2013/02/19 01:42:39 zmedico Exp $
92 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-9999.ebuild,v 1.13 2013/02/27 05:44:01 vapier Exp $
93
94 # See `man savedconfig.eclass` for info on how to use USE=savedconfig.
95
96 @@ -51,7 +51,12 @@
97 }
98
99 busybox_config_enabled() {
100 - grep "^CONFIG_$1=y" -q .config
101 + local val=$(sed -n "/^CONFIG_$1=/s:^[^=]*=::p" .config)
102 + case ${val} in
103 + "") return 1 ;;
104 + y) return 0 ;;
105 + *) echo "${val}" | sed -r 's:^"(.*)"$:\1:' ;;
106 + esac
107 }
108
109 src_prepare() {
110 @@ -224,6 +229,15 @@
111 newconfd "${FILESDIR}/watchdog.confd" "busybox-watchdog"
112 newinitd "${FILESDIR}/watchdog.initd" "busybox-watchdog"
113 fi
114 + if busybox_config_enabled UDHCPC; then
115 + local path=$(busybox_config_enabled UDHCPC_DEFAULT_SCRIPT)
116 + insinto "${path%/*}"
117 + newins examples/udhcp/simple.script "${path##*/}"
118 + fi
119 + if busybox_config_enabled UDHCPD; then
120 + insinto /etc
121 + doins examples/udhcp/udhcpd.conf
122 + fi
123
124 # bundle up the symlink files for use later
125 emake DESTDIR="${ED}" install
126
127
128
129 1.341 sys-apps/busybox/ChangeLog
130
131 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/busybox/ChangeLog?rev=1.341&view=markup
132 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/busybox/ChangeLog?rev=1.341&content-type=text/plain
133 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/busybox/ChangeLog?r1=1.340&r2=1.341
134
135 Index: ChangeLog
136 ===================================================================
137 RCS file: /var/cvsroot/gentoo-x86/sys-apps/busybox/ChangeLog,v
138 retrieving revision 1.340
139 retrieving revision 1.341
140 diff -u -r1.340 -r1.341
141 --- ChangeLog 19 Feb 2013 01:42:39 -0000 1.340
142 +++ ChangeLog 27 Feb 2013 05:44:01 -0000 1.341
143 @@ -1,6 +1,10 @@
144 # ChangeLog for sys-apps/busybox
145 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
146 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/ChangeLog,v 1.340 2013/02/19 01:42:39 zmedico Exp $
147 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/ChangeLog,v 1.341 2013/02/27 05:44:01 vapier Exp $
148 +
149 + 27 Feb 2013; Mike Frysinger <vapier@g.o> busybox-1.21.0.ebuild,
150 + busybox-9999.ebuild:
151 + Install the udhcp config files when features are enabled.
152
153 19 Feb 2013; Zac Medico <zmedico@g.o> busybox-1.21.0.ebuild,
154 busybox-9999.ebuild:
Report Message
Find on MARC Find on Google Groups