Gentoo Archives: gentoo-commits

From: "Amadeusz Zolnowski (aidecoe)" <aidecoe@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in sys-kernel/dracut: ChangeLog dracut-017-r1.ebuild dracut-017.ebuild
Date: Thu, 01 Mar 2012 08:40:56
Message-Id: 20120301084044.BCA822004B@flycatcher.gentoo.org
1 aidecoe 12/03/01 08:40:44
2
3 Modified: ChangeLog
4 Added: dracut-017-r1.ebuild
5 Removed: dracut-017.ebuild
6 Log:
7 sys-kernel/dracut-017: Don't create broken misplaced symlink.
8
9 (Portage version: 2.1.10.48/cvs/Linux x86_64)
10
11 Revision Changes Path
12 1.53 sys-kernel/dracut/ChangeLog
13
14 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-kernel/dracut/ChangeLog?rev=1.53&view=markup
15 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-kernel/dracut/ChangeLog?rev=1.53&content-type=text/plain
16 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-kernel/dracut/ChangeLog?r1=1.52&r2=1.53
17
18 Index: ChangeLog
19 ===================================================================
20 RCS file: /var/cvsroot/gentoo-x86/sys-kernel/dracut/ChangeLog,v
21 retrieving revision 1.52
22 retrieving revision 1.53
23 diff -u -r1.52 -r1.53
24 --- ChangeLog 29 Feb 2012 18:22:09 -0000 1.52
25 +++ ChangeLog 1 Mar 2012 08:40:44 -0000 1.53
26 @@ -1,6 +1,12 @@
27 # ChangeLog for sys-kernel/dracut
28 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
29 -# $Header: /var/cvsroot/gentoo-x86/sys-kernel/dracut/ChangeLog,v 1.52 2012/02/29 18:22:09 aidecoe Exp $
30 +# $Header: /var/cvsroot/gentoo-x86/sys-kernel/dracut/ChangeLog,v 1.53 2012/03/01 08:40:44 aidecoe Exp $
31 +
32 +*dracut-017-r1 (01 Mar 2012)
33 +
34 + 01 Mar 2012; Amadeusz Żołnowski <aidecoe@g.o> -dracut-017.ebuild,
35 + +dracut-017-r1.ebuild:
36 + Don't create broken misplaced symlink.
37
38 29 Feb 2012; Amadeusz Żołnowski <aidecoe@g.o> -dracut-010-r3.ebuild,
39 -files/dracut-010-empty-etc-ld.so.conf.d.patch,
40
41
42
43 1.1 sys-kernel/dracut/dracut-017-r1.ebuild
44
45 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-kernel/dracut/dracut-017-r1.ebuild?rev=1.1&view=markup
46 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-kernel/dracut/dracut-017-r1.ebuild?rev=1.1&content-type=text/plain
47
48 Index: dracut-017-r1.ebuild
49 ===================================================================
50 # Copyright 1999-2012 Gentoo Foundation
51 # Distributed under the terms of the GNU General Public License v2
52 # $Header: /var/cvsroot/gentoo-x86/sys-kernel/dracut/dracut-017-r1.ebuild,v 1.1 2012/03/01 08:40:44 aidecoe Exp $
53
54 EAPI=4
55
56 inherit eutils linux-info
57
58 add_req_use_for() {
59 local dep="$1"; shift
60 local f
61
62 for f in "$@"; do
63 REQUIRED_USE+="${f}? ( ${dep} )
64 "
65 done
66 }
67
68 DESCRIPTION="Generic initramfs generation tool"
69 HOMEPAGE="http://dracut.wiki.kernel.org"
70 SRC_URI="mirror://kernel/linux/utils/boot/${PN}/${P}.tar.bz2"
71 LICENSE="GPL-2"
72 SLOT="0"
73 KEYWORDS="~amd64 ~x86"
74
75 REQUIRED_USE="dracut_modules_crypt-gpg? ( dracut_modules_crypt )
76 dracut_modules_livenet? ( dracut_modules_dmsquash-live )
77 "
78 COMMON_MODULES="
79 dracut_modules_biosdevname
80 dracut_modules_btrfs
81 dracut_modules_caps
82 dracut_modules_crypt-gpg
83 dracut_modules_gensplash
84 dracut_modules_mdraid
85 dracut_modules_multipath
86 dracut_modules_plymouth
87 dracut_modules_syslog
88 "
89 DM_MODULES="
90 dracut_modules_crypt
91 dracut_modules_dmraid
92 dracut_modules_dmsquash-live
93 dracut_modules_livenet
94 dracut_modules_lvm
95 "
96 NETWORK_MODULES="
97 dracut_modules_iscsi
98 dracut_modules_livenet
99 dracut_modules_nbd
100 dracut_modules_nfs
101 dracut_modules_ssh-client
102 "
103 add_req_use_for device-mapper ${DM_MODULES}
104 add_req_use_for net ${NETWORK_MODULES}
105 IUSE_DRACUT_MODULES="${COMMON_MODULES} ${DM_MODULES} ${NETWORK_MODULES}"
106 IUSE="debug device-mapper net selinux ${IUSE_DRACUT_MODULES}"
107
108 RESTRICT="test"
109
110 RDEPEND="
111 >=app-shells/bash-4.0
112 >=app-shells/dash-0.5.4.11
113 >=sys-apps/baselayout-1.12.14-r1
114 >=sys-apps/sysvinit-2.87-r3
115 >=sys-apps/util-linux-2.20
116 >=sys-fs/udev-164
117 app-arch/cpio
118 || ( >=sys-apps/module-init-tools-3.8 >sys-apps/kmod-5[tools] )
119
120 debug? ( dev-util/strace )
121 device-mapper? ( || ( sys-fs/device-mapper >=sys-fs/lvm2-2.02.33 ) )
122 net? ( net-misc/curl >=net-misc/dhcp-4.2.1-r1 sys-apps/iproute2 )
123 selinux? ( sys-libs/libselinux sys-libs/libsepol )
124 dracut_modules_biosdevname? ( sys-apps/biosdevname )
125 dracut_modules_btrfs? ( sys-fs/btrfs-progs )
126 dracut_modules_caps? ( sys-libs/libcap )
127 dracut_modules_crypt? ( sys-fs/cryptsetup )
128 dracut_modules_crypt-gpg? ( app-crypt/gnupg )
129 dracut_modules_dmraid? ( sys-fs/dmraid sys-fs/multipath-tools )
130 dracut_modules_gensplash? ( media-gfx/splashutils )
131 dracut_modules_iscsi? ( >=sys-block/open-iscsi-2.0.871.3 )
132 dracut_modules_lvm? ( >=sys-fs/lvm2-2.02.33 )
133 dracut_modules_mdraid? ( sys-fs/mdadm )
134 dracut_modules_multipath? ( sys-fs/multipath-tools )
135 dracut_modules_nbd? ( sys-block/nbd )
136 dracut_modules_nfs? ( net-fs/nfs-utils net-nds/rpcbind )
137 dracut_modules_plymouth? ( >=sys-boot/plymouth-0.8.3-r1 )
138 dracut_modules_ssh-client? ( dev-libs/openssl )
139 dracut_modules_syslog? ( || ( app-admin/syslog-ng app-admin/rsyslog ) )
140 "
141 DEPEND="
142 >=dev-libs/libxslt-1.1.26
143 app-text/docbook-xml-dtd:4.5
144 >=app-text/docbook-xsl-stylesheets-1.75.2
145 "
146
147 #
148 # Helper functions
149 #
150
151 # Returns true if any of specified modules is enabled by USE flag and false
152 # otherwise.
153 # $1 = list of modules (which have corresponding USE flags of the same name)
154 any_module() {
155 local m modules=" $@ "
156
157 for m in ${modules}; do
158 ! use $m && modules=${modules/ $m / }
159 done
160
161 shopt -s extglob
162 modules=${modules%%+( )}
163 shopt -u extglob
164
165 [[ ${modules} ]]
166 }
167
168 # Removes module from modules.d.
169 # $1 = module name
170 # Module name can be specified without number prefix.
171 rm_module() {
172 local force m
173 [[ $1 = -f ]] && force=-f
174
175 for m in $@; do
176 if [[ $m =~ ^[0-9][0-9][^\ ]*$ ]]; then
177 rm ${force} --interactive=never -r "${modules_dir}"/$m
178 else
179 rm ${force} --interactive=never -r "${modules_dir}"/[0-9][0-9]$m
180 fi
181 done
182 }
183
184 # Displays Gentoo Base System major release number
185 base_sys_maj_ver() {
186 local line
187
188 read line < /etc/gentoo-release
189 line=${line##* }
190 echo "${line%%.*}"
191 }
192
193 #
194 # ebuild functions
195 #
196
197 src_prepare() {
198 epatch "${FILESDIR}/${P}-multipath-udev-rules.patch"
199 epatch "${FILESDIR}/${P}-usrmount-fstab-comments.patch"
200 epatch "${FILESDIR}/${P}-usrmount-newroot-etc-check.patch"
201 epatch "${FILESDIR}/${P}-convertfs-fix-check-for-usr-bin.patch"
202 epatch "${FILESDIR}/${P}-crypt-simplify-rd.luks.uuid-testing.patch"
203 }
204
205 src_compile() {
206 emake WITH_SWITCH_ROOT=0
207 }
208
209 src_install() {
210 emake WITH_SWITCH_ROOT=0 \
211 prefix=/usr sysconfdir=/etc DESTDIR="${D}" \
212 install
213
214 local gen2conf
215
216 dodir /var/lib/dracut/overlay
217 dodoc HACKING TODO AUTHORS NEWS README*
218
219 case "$(base_sys_maj_ver)" in
220 1) gen2conf=gentoo.conf ;;
221 2) gen2conf=gentoo-openrc.conf ;;
222 *) die "Expected ver. 1 or 2 of Gentoo Base System (/etc/gentoo-release)."
223 esac
224
225 insinto /etc/dracut.conf.d
226 newins dracut.conf.d/${gen2conf}.example ${gen2conf}
227
228 insinto /etc/logrotate.d
229 newins dracut.logrotate dracut
230
231 #
232 # Modules
233 #
234 local module
235 modules_dir="${D}/usr/lib/dracut/modules.d"
236
237 echo "${PF}" > "${modules_dir}"/10rpmversion/dracut-version \
238 || die 'dracut-version failed'
239
240 # Remove modules not enabled by USE flags
241 for module in ${IUSE_DRACUT_MODULES} ; do
242 ! use ${module} && rm_module -f ${module#dracut_modules_}
243 done
244
245 # Those flags are specific, and even are corresponding to modules, they need
246 # to be declared as regular USE flags.
247 use debug || rm_module 95debug
248 use selinux || rm_module 98selinux
249
250 # Following flags define set of helper modules which are base dependencies
251 # for others and as so have no practical use, so remove these modules.
252 use device-mapper || rm_module 90dm
253 use net || rm_module 40network 45ifcfg 45url-lib
254
255 # Remove S/390 modules which are not tested at all
256 rm_module 95dasd 95dasd_mod 95zfcp 95znet
257
258 # Remove modules which won't work for sure
259 rm_module 95fcoe # no tools
260 # fips module depends on masked app-crypt/hmaccalc
261 rm_module 01fips 02fips-aesni
262
263 # Remove extra modules which go to future dracut-extras
264 rm_module 00bootchart 05busybox 97masterkey 98ecryptfs 98integrity
265 }
266
267 pkg_postinst() {
268 if linux-info_get_any_version && linux_config_src_exists; then
269 echo
270 ewarn "If the following test report contains a missing kernel"
271 ewarn "configuration option, you should reconfigure and rebuild your"
272 ewarn "kernel before booting image generated with this Dracut version."
273 echo
274
275 local CONFIG_CHECK="~BLK_DEV_INITRD ~DEVTMPFS ~MODULES"
276
277 # Kernel configuration options descriptions:
278 local desc_DEVTMPFS="Maintain a devtmpfs filesystem to mount at /dev"
279 local desc_BLK_DEV_INITRD="Initial RAM filesystem and RAM disk "\
280 "(initramfs/initrd) support"
281 local desc_MODULES="Enable loadable module support"
282
283 local opt desc
284
285 # Generate ERROR_* variables for check_extra_config.
286 for opt in ${CONFIG_CHECK}; do
287 opt=${opt#\~}
288 desc=desc_${opt}
289 eval "local ERROR_${opt}='CONFIG_${opt}: \"${!desc}\"" \
290 "is missing and REQUIRED'"
291 done
292
293 check_extra_config
294 echo
295 fi
296
297 elog 'To generate the initramfs:'
298 elog ' # mount /boot (if necessary)'
299 elog ' # dracut "" <kernel-version>'
300 elog ''
301 elog 'For command line documentation see dracut.kernel(7).'
302 elog ''
303 elog 'Simple example to select root and resume partition:'
304 elog ' root=/dev/sda1 resume=/dev/sda2'
305 elog ''
306 elog 'To include only dracut modules and kernel drivers for this system,'
307 elog 'use the "-H" option. Some modules need to be explicitly added with'
308 elog '"-a" option even if required tools are installed.'
309 }