| 1 |
aidecoe 14/02/26 20:16:30 |
| 2 |
|
| 3 |
Modified: ChangeLog |
| 4 |
Added: dracut-036-r4.ebuild |
| 5 |
Log: |
| 6 |
Fixed bug #502102. |
| 7 |
|
| 8 |
Commit on behalf of Alexander Tsoy <alexander@××××.me>. |
| 9 |
|
| 10 |
(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key F0134531E1DBFAB5) |
| 11 |
|
| 12 |
Revision Changes Path |
| 13 |
1.158 sys-kernel/dracut/ChangeLog |
| 14 |
|
| 15 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-kernel/dracut/ChangeLog?rev=1.158&view=markup |
| 16 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-kernel/dracut/ChangeLog?rev=1.158&content-type=text/plain |
| 17 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-kernel/dracut/ChangeLog?r1=1.157&r2=1.158 |
| 18 |
|
| 19 |
Index: ChangeLog |
| 20 |
=================================================================== |
| 21 |
RCS file: /var/cvsroot/gentoo-x86/sys-kernel/dracut/ChangeLog,v |
| 22 |
retrieving revision 1.157 |
| 23 |
retrieving revision 1.158 |
| 24 |
diff -u -r1.157 -r1.158 |
| 25 |
--- ChangeLog 24 Feb 2014 14:22:35 -0000 1.157 |
| 26 |
+++ ChangeLog 26 Feb 2014 20:16:30 -0000 1.158 |
| 27 |
@@ -1,6 +1,14 @@ |
| 28 |
# ChangeLog for sys-kernel/dracut |
| 29 |
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 |
| 30 |
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/dracut/ChangeLog,v 1.157 2014/02/24 14:22:35 aidecoe Exp $ |
| 31 |
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/dracut/ChangeLog,v 1.158 2014/02/26 20:16:30 aidecoe Exp $ |
| 32 |
+ |
| 33 |
+*dracut-036-r4 (26 Feb 2014) |
| 34 |
+ |
| 35 |
+ 26 Feb 2014; Amadeusz Żołnowski <aidecoe@g.o> +dracut-036-r4.ebuild, |
| 36 |
+ +files/036-0008-Add-legacy-flag-l-to-lz4-and-update-ma.patch: |
| 37 |
+ Fixed bug #502102. |
| 38 |
+ |
| 39 |
+ Commit on behalf of Alexander Tsoy <alexander@××××.me>. |
| 40 |
|
| 41 |
24 Feb 2014; Amadeusz Żołnowski <aidecoe@g.o> -dracut-036.ebuild, |
| 42 |
-dracut-036-r1.ebuild, -dracut-036-r2.ebuild: |
| 43 |
|
| 44 |
|
| 45 |
|
| 46 |
1.1 sys-kernel/dracut/dracut-036-r4.ebuild |
| 47 |
|
| 48 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-kernel/dracut/dracut-036-r4.ebuild?rev=1.1&view=markup |
| 49 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-kernel/dracut/dracut-036-r4.ebuild?rev=1.1&content-type=text/plain |
| 50 |
|
| 51 |
Index: dracut-036-r4.ebuild |
| 52 |
=================================================================== |
| 53 |
# Copyright 1999-2014 Gentoo Foundation |
| 54 |
# Distributed under the terms of the GNU General Public License v2 |
| 55 |
# $Header: /var/cvsroot/gentoo-x86/sys-kernel/dracut/dracut-036-r4.ebuild,v 1.1 2014/02/26 20:16:30 aidecoe Exp $ |
| 56 |
|
| 57 |
EAPI=4 |
| 58 |
|
| 59 |
inherit bash-completion-r1 eutils linux-info multilib systemd |
| 60 |
|
| 61 |
DESCRIPTION="Generic initramfs generation tool" |
| 62 |
HOMEPAGE="http://dracut.wiki.kernel.org" |
| 63 |
SRC_URI="mirror://kernel/linux/utils/boot/${PN}/${P}.tar.xz" |
| 64 |
LICENSE="GPL-2" |
| 65 |
SLOT="0" |
| 66 |
KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86" |
| 67 |
IUSE="debug selinux systemd" |
| 68 |
|
| 69 |
RESTRICT="test" |
| 70 |
|
| 71 |
CDEPEND="virtual/udev |
| 72 |
systemd? ( >=sys-apps/systemd-199 ) |
| 73 |
selinux? ( sec-policy/selinux-dracut ) |
| 74 |
" |
| 75 |
RDEPEND="${CDEPEND} |
| 76 |
app-arch/cpio |
| 77 |
>=app-shells/bash-4.0 |
| 78 |
>sys-apps/kmod-5[tools] |
| 79 |
|| ( >=sys-apps/sysvinit-2.87-r3 sys-apps/systemd-sysv-utils ) |
| 80 |
>=sys-apps/util-linux-2.21 |
| 81 |
|
| 82 |
debug? ( dev-util/strace ) |
| 83 |
selinux? ( sys-libs/libselinux sys-libs/libsepol ) |
| 84 |
" |
| 85 |
DEPEND="${CDEPEND} |
| 86 |
app-text/asciidoc |
| 87 |
>=dev-libs/libxslt-1.1.26 |
| 88 |
app-text/docbook-xml-dtd:4.5 |
| 89 |
>=app-text/docbook-xsl-stylesheets-1.75.2 |
| 90 |
virtual/pkgconfig |
| 91 |
" |
| 92 |
|
| 93 |
DOCS=( AUTHORS HACKING NEWS README README.generic README.kernel README.modules |
| 94 |
README.testsuite TODO ) |
| 95 |
MY_LIBDIR=/usr/lib |
| 96 |
PATCHES=( |
| 97 |
"${FILESDIR}/${PV}-0001-NEWS-update-for-version-036.patch" |
| 98 |
"${FILESDIR}/${PV}-0002-dracut-functions.sh-support-for-altern.patch" |
| 99 |
"${FILESDIR}/${PV}-0003-gentoo.conf-let-udevdir-be-handled-by-.patch" |
| 100 |
"${FILESDIR}/${PV}-0004-Use-the-same-paths-in-dracut.sh-as-tho.patch" |
| 101 |
"${FILESDIR}/${PV}-0005-Install-dracut-install-into-libexec-di.patch" |
| 102 |
"${FILESDIR}/${PV}-0006-dracut.sh-Fix-variable-name-typo.patch" |
| 103 |
"${FILESDIR}/${PV}-0007-Added-missing-quotes.patch" |
| 104 |
"${FILESDIR}/${PV}-0008-Add-legacy-flag-l-to-lz4-and-update-ma.patch" |
| 105 |
) |
| 106 |
|
| 107 |
# |
| 108 |
# Helper functions |
| 109 |
# |
| 110 |
|
| 111 |
# Removes module from modules.d. |
| 112 |
# $1 = module name |
| 113 |
# Module name can be specified without number prefix. |
| 114 |
rm_module() { |
| 115 |
local force m |
| 116 |
[[ $1 = -f ]] && force=-f |
| 117 |
|
| 118 |
for m in $@; do |
| 119 |
if [[ $m =~ ^[0-9][0-9][^\ ]*$ ]]; then |
| 120 |
rm ${force} --interactive=never -r "${modules_dir}"/$m |
| 121 |
else |
| 122 |
rm ${force} --interactive=never -r "${modules_dir}"/[0-9][0-9]$m |
| 123 |
fi |
| 124 |
done |
| 125 |
} |
| 126 |
|
| 127 |
# Grabbed from net-misc/netctl ebuild. |
| 128 |
optfeature() { |
| 129 |
local desc=$1 |
| 130 |
shift |
| 131 |
while (( $# )); do |
| 132 |
if has_version "$1"; then |
| 133 |
elog " [I] $1 to ${desc}" |
| 134 |
else |
| 135 |
elog " [ ] $1 to ${desc}" |
| 136 |
fi |
| 137 |
shift |
| 138 |
done |
| 139 |
} |
| 140 |
|
| 141 |
# |
| 142 |
# ebuild functions |
| 143 |
# |
| 144 |
|
| 145 |
src_prepare() { |
| 146 |
epatch "${PATCHES[@]}" |
| 147 |
|
| 148 |
local libdirs="/$(get_libdir) /usr/$(get_libdir)" |
| 149 |
[[ $libdirs =~ /lib\ ]] || libdirs+=" /lib /usr/lib" |
| 150 |
einfo "Setting libdirs to \"${libdirs}\" ..." |
| 151 |
sed -e "3alibdirs=\"${libdirs}\"" \ |
| 152 |
-i "${S}/dracut.conf.d/gentoo.conf.example" || die |
| 153 |
|
| 154 |
local udevdir="$("$(tc-getPKG_CONFIG)" udev --variable=udevdir)" |
| 155 |
einfo "Setting udevdir to ${udevdir}..." |
| 156 |
sed -r -e "s|^(udevdir=).*$|\1${udevdir}|" \ |
| 157 |
-i "${S}/dracut.conf.d/gentoo.conf.example" || die |
| 158 |
|
| 159 |
if use systemd; then |
| 160 |
local systemdutildir="$(systemd_get_utildir)" |
| 161 |
local systemdsystemunitdir="$(systemd_get_unitdir)" |
| 162 |
local systemdsystemconfdir="$("$(tc-getPKG_CONFIG)" systemd \ |
| 163 |
--variable=systemdsystemconfdir)" |
| 164 |
[[ ${systemdsystemconfdir} ]] \ |
| 165 |
|| systemdsystemconfdir=/etc/systemd/system |
| 166 |
einfo "Setting systemdutildir to ${systemdutildir} and ..." |
| 167 |
sed -e "5asystemdutildir=\"${systemdutildir}\"" \ |
| 168 |
-i "${S}/dracut.conf.d/gentoo.conf.example" || die |
| 169 |
einfo "Setting systemdsystemunitdir to ${systemdsystemunitdir} and..." |
| 170 |
sed -e "6asystemdsystemunitdir=\"${systemdsystemunitdir}\"" \ |
| 171 |
-i "${S}/dracut.conf.d/gentoo.conf.example" || die |
| 172 |
einfo "Setting systemdsystemconfdir to ${systemdsystemconfdir}..." |
| 173 |
sed -e "7asystemdsystemconfdir=\"${systemdsystemconfdir}\"" \ |
| 174 |
-i "${S}/dracut.conf.d/gentoo.conf.example" || die |
| 175 |
fi |
| 176 |
|
| 177 |
epatch_user |
| 178 |
} |
| 179 |
|
| 180 |
src_configure() { |
| 181 |
local myconf="--libdir=${MY_LIBDIR}" |
| 182 |
myconf+=" --bashcompletiondir=$(get_bashcompdir)" |
| 183 |
|
| 184 |
if use systemd; then |
| 185 |
myconf+=" --systemdsystemunitdir='$(systemd_get_unitdir)'" |
| 186 |
fi |
| 187 |
|
| 188 |
econf ${myconf} |
| 189 |
} |
| 190 |
|
| 191 |
src_compile() { |
| 192 |
tc-export CC |
| 193 |
emake doc install/dracut-install |
| 194 |
} |
| 195 |
|
| 196 |
src_install() { |
| 197 |
default |
| 198 |
|
| 199 |
local my_libdir="${MY_LIBDIR}" |
| 200 |
local dracutlibdir="${my_libdir#/}/dracut" |
| 201 |
|
| 202 |
echo "DRACUT_VERSION=$PVR" > "${D%/}/${dracutlibdir}/dracut-version.sh" |
| 203 |
|
| 204 |
insinto "${dracutlibdir}/dracut.conf.d/" |
| 205 |
newins dracut.conf.d/gentoo.conf.example gentoo.conf |
| 206 |
|
| 207 |
insinto /etc/logrotate.d |
| 208 |
newins dracut.logrotate dracut |
| 209 |
|
| 210 |
dodir /var/lib/dracut/overlay |
| 211 |
|
| 212 |
dohtml dracut.html |
| 213 |
|
| 214 |
# |
| 215 |
# Modules |
| 216 |
# |
| 217 |
local module |
| 218 |
modules_dir="${D%/}/${dracutlibdir}/modules.d" |
| 219 |
|
| 220 |
use debug || rm_module 95debug |
| 221 |
use selinux || rm_module 98selinux |
| 222 |
|
| 223 |
if use systemd; then |
| 224 |
# With systemd following modules do not make sense |
| 225 |
rm_module 96securityfs 97masterkey 98integrity |
| 226 |
else |
| 227 |
# Without systemd following modules do not make sense |
| 228 |
rm_module 00systemd-bootchart |
| 229 |
fi |
| 230 |
|
| 231 |
# Remove modules which won't work for sure |
| 232 |
rm_module 95fcoe # no tools |
| 233 |
# fips module depends on masked app-crypt/hmaccalc |
| 234 |
rm_module 01fips 02fips-aesni |
| 235 |
} |
| 236 |
|
| 237 |
pkg_postinst() { |
| 238 |
if linux-info_get_any_version && linux_config_src_exists; then |
| 239 |
ewarn "" |
| 240 |
ewarn "If the following test report contains a missing kernel" |
| 241 |
ewarn "configuration option, you should reconfigure and rebuild your" |
| 242 |
ewarn "kernel before booting image generated with this Dracut version." |
| 243 |
ewarn "" |
| 244 |
|
| 245 |
local CONFIG_CHECK="~BLK_DEV_INITRD ~DEVTMPFS" |
| 246 |
|
| 247 |
# Kernel configuration options descriptions: |
| 248 |
local desc_DEVTMPFS="Maintain a devtmpfs filesystem to mount at /dev" |
| 249 |
local desc_BLK_DEV_INITRD="Initial RAM filesystem and RAM disk "\ |
| 250 |
"(initramfs/initrd) support" |
| 251 |
|
| 252 |
local opt desc |
| 253 |
|
| 254 |
# Generate ERROR_* variables for check_extra_config. |
| 255 |
for opt in ${CONFIG_CHECK}; do |
| 256 |
opt=${opt#\~} |
| 257 |
desc=desc_${opt} |
| 258 |
eval "local ERROR_${opt}='CONFIG_${opt}: \"${!desc}\"" \ |
| 259 |
"is missing and REQUIRED'" |
| 260 |
done |
| 261 |
|
| 262 |
check_extra_config |
| 263 |
echo |
| 264 |
else |
| 265 |
ewarn "" |
| 266 |
ewarn "Your kernel configuration couldn't be checked. Do you have" |
| 267 |
ewarn "/usr/src/linux/.config file there? Please check manually if" |
| 268 |
ewarn "following options are enabled:" |
| 269 |
ewarn "" |
| 270 |
ewarn " CONFIG_BLK_DEV_INITRD" |
| 271 |
ewarn " CONFIG_DEVTMPFS" |
| 272 |
ewarn "" |
| 273 |
fi |
| 274 |
|
| 275 |
elog "To get additional features, a number of optional runtime" |
| 276 |
elog "dependencies may be installed:" |
| 277 |
elog "" |
| 278 |
optfeature "Networking support" net-misc/curl "net-misc/dhcp[client]" \ |
| 279 |
sys-apps/iproute2 |
| 280 |
optfeature \ |
| 281 |
"Measure performance of the boot process for later visualisation" \ |
| 282 |
app-benchmarks/bootchart2 sys-apps/usleep sys-process/acct |
| 283 |
optfeature "Scan for Btrfs on block devices" sys-fs/btrfs-progs |
| 284 |
optfeature "Load kernel modules and drop this privilege for real init" \ |
| 285 |
sys-libs/libcap |
| 286 |
optfeature "Support CIFS" net-fs/cifs-utils |
| 287 |
optfeature "Decrypt devices encrypted with cryptsetup/LUKS" \ |
| 288 |
sys-fs/cryptsetup |
| 289 |
optfeature "Support for GPG-encrypted keys for crypt module" \ |
| 290 |
app-crypt/gnupg |
| 291 |
optfeature \ |
| 292 |
"Allows use of dash instead of default bash (on your own risk)" \ |
| 293 |
app-shells/dash |
| 294 |
optfeature "Framebuffer splash (media-gfx/splashutils)" \ |
| 295 |
media-gfx/splashutils |
| 296 |
optfeature "Support iSCSI" sys-block/open-iscsi |
| 297 |
optfeature "Support Logical Volume Manager" sys-fs/lvm2 |
| 298 |
optfeature "Support MD devices, also known as software RAID devices" \ |
| 299 |
sys-fs/mdadm |
| 300 |
optfeature "Support Device Mapper multipathing" sys-fs/multipath-tools |
| 301 |
optfeature "Plymouth boot splash" sys-boot/plymouth |
| 302 |
optfeature "Support network block devices" sys-block/nbd |
| 303 |
optfeature "Support NFS" net-fs/nfs-utils net-nds/rpcbind |
| 304 |
optfeature \ |
| 305 |
"Install ssh and scp along with config files and specified keys" \ |
| 306 |
dev-libs/openssl |
| 307 |
optfeature "Enable logging with syslog-ng or rsyslog" app-admin/syslog-ng \ |
| 308 |
app-admin/rsyslog |
| 309 |
} |
Archives