From 063337ba824d8d5858ae38dcc75f8be651d0af99 Mon Sep 17 00:00:00 2001 From: Bertrand Jacquin Date: Mon, 10 Jun 2013 16:52:51 +0200 Subject: flx/initramfs: remove lzma, only use xz Package-Manager: portage-2.1.12.4 --- flx/initramfs/ChangeLog | 5 ++++- flx/initramfs/Manifest | 6 +++--- flx/initramfs/initramfs-0.ebuild | 30 ++++++++++-------------------- flx/initramfs/metadata.xml | 7 ++++--- metadata/md5-cache/flx/initramfs-0 | 8 ++++---- profiles/use.local.desc | 1 - 6 files changed, 25 insertions(+), 32 deletions(-) diff --git a/flx/initramfs/ChangeLog b/flx/initramfs/ChangeLog index 12ff61e6..5628d7c4 100644 --- a/flx/initramfs/ChangeLog +++ b/flx/initramfs/ChangeLog @@ -2,9 +2,12 @@ # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 10 Jun 2013; Bertrand Jacquin initramfs-0.ebuild, + metadata.xml: + flx/initramfs: remove lzma, only use xz + *initramfs-0 (29 May 2013) 29 May 2013; Bertrand Jacquin +initramfs-0.ebuild, +metadata.xml: Add some dumb packages - diff --git a/flx/initramfs/Manifest b/flx/initramfs/Manifest index 00b6ed76..d868a0a1 100644 --- a/flx/initramfs/Manifest +++ b/flx/initramfs/Manifest @@ -1,3 +1,3 @@ -EBUILD initramfs-0.ebuild 2095 SHA256 5f6d11c7a05e3284edfcb35e7af10fdde99828886e728151fe0c5435ba7fe5b3 WHIRLPOOL 6852c3d40310607571f345595b5d5e466ace3c97bb62604624c868d41aae4653f6bdbf16dfb7e399d57ffbddfd53b1364884d1dd6abe8a3242ed019e59ebb9b0 -MISC ChangeLog 259 SHA256 e5e6c8dbb433a2a86f20b270edd30a55dca4cc9625a37b50fcc680fc7fcedaff WHIRLPOOL 9ce2b9b05107b5ac8f03d68c85f995b7dec433d25aa64e897c2ec90bc40b05c9427fcb5e91671252205a3cc493b9e2d95d93017d55a8e5b202ac9efeff41f663 -MISC metadata.xml 212 SHA256 aa0f036698b7c5a290f7f96d404b02291c8334ce8e03138921a1b519fe004d49 WHIRLPOOL 2f9d0dbb799be904c7c33eac5ef93a9045caa1baf72907746415ebe3a4ac163452d120b72e021f965afc3c1d2c8b224331f7a87adf12b7e684bdbc244d9af7b6 +EBUILD initramfs-0.ebuild 1824 SHA256 14d1f1111c251cc939052f14b3fe7919e00f6b688667dd5c185c809b359ddfa0 WHIRLPOOL 09d2042b3c587096649a371ae1f27d5a761ad856915f7588248d093911039bef98aa8e7143744815ccc19e8ba95e93808aaf68249523b2fbd45bc4f62c8d22b0 +MISC ChangeLog 390 SHA256 53f8e588928e312323fcdd0a7b81f10a8a86ee8cdb5a48982b9e672d5352b048 WHIRLPOOL 23504fe0714a65e3ec2dc6fe3fb39312cd0c46eae8b3c68425008c1513512be21322dc42b4d09af3c36248915742947a7f485c7975deedab7af1ae6dbfa95992 +MISC metadata.xml 236 SHA256 92980ad154191325f8b7a3307de845abd61d0089b66c8fae74f6b5b650da7f01 WHIRLPOOL c6b4b111994912c44d794b2354af2ed6f6f2f5f7cc808efb0917886574f208b0475c7d508e8347790e8704144e41144c3ac0d13588821b02f42d1eb098fa9d2b diff --git a/flx/initramfs/initramfs-0.ebuild b/flx/initramfs/initramfs-0.ebuild index 4105d433..67ab0b07 100644 --- a/flx/initramfs/initramfs-0.ebuild +++ b/flx/initramfs/initramfs-0.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: $ -EAPI=4 +EAPI=5 inherit flx-tools DESCRIPTION="build initramfs" @@ -10,14 +10,13 @@ DESCRIPTION="build initramfs" LICENSE="public-domain" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="bzip2 gzip lzma lzo xz" +IUSE="bzip2 gzip lzma lzo" DEPEND="app-arch/cpio bzip2? ( app-arch/bzip2 ) gzip? ( app-arch/gzip ) - lzma? ( app-arch/lzma ) - lzo? ( app-arch/lzop ) - xz? ( app-arch/xz-utils )" + lzma? ( app-arch/xz-utils ) + lzo? ( app-arch/lzop )" DEF_CPIO_FLAGS="--quiet" DEF_BZIP2_FLAGS="--best" @@ -61,11 +60,11 @@ src_compile () fi if use lzma ; then - einfo "Building initramfs.cpio.lzma" - lzma -c ${LZMA_FLAGS:-$DEF_LZMA_FLAGS} \ + einfo "Building initramfs.cpio.xz" + xz -c ${XZ_FLAGS:-$DEF_XZ_FLAGS} \ < initramfs.cpio \ - > initramfs.cpio.lzma \ - || die "Failed to create initramfs.cpio.lzma" + > initramfs.cpio.xz \ + || die "Failed to create initramfs.cpio.xz" fi if use lzo ; then @@ -75,14 +74,6 @@ src_compile () > initramfs.cpio.lzo \ || die "Failed to create initramfs.cpio.lzo" fi - - if use xz ; then - einfo "Building initramfs.cpio.xz" - xz -c ${XZ_FLAGS:-$DEF_XZ_FLAGS} \ - < initramfs.cpio \ - > initramfs.cpio.xz \ - || die "Failed to create initramfs.cpio.xz" - fi } src_install () @@ -93,7 +84,6 @@ src_install () use bzip2 && doins initramfs.cpio.bz2 use gzip && doins initramfs.cpio.gz - use lzma && doins initramfs.cpio.lzma + use lzma && doins initramfs.cpio.xz use lzo && doins initramfs.cpio.lzo - use xz && doins initramfs.cpio.xz } diff --git a/flx/initramfs/metadata.xml b/flx/initramfs/metadata.xml index 13f74319..c585ed44 100644 --- a/flx/initramfs/metadata.xml +++ b/flx/initramfs/metadata.xml @@ -1,7 +1,8 @@ - - Compress using XZ/LZMA algorithm - + + beber@meleeweb.net + Bertrand Jacquin + diff --git a/metadata/md5-cache/flx/initramfs-0 b/metadata/md5-cache/flx/initramfs-0 index 5f3c63de..77f5ed87 100644 --- a/metadata/md5-cache/flx/initramfs-0 +++ b/metadata/md5-cache/flx/initramfs-0 @@ -1,11 +1,11 @@ DEFINED_PHASES=compile install unpack -DEPEND=app-arch/cpio bzip2? ( app-arch/bzip2 ) gzip? ( app-arch/gzip ) lzma? ( app-arch/lzma ) lzo? ( app-arch/lzop ) xz? ( app-arch/xz-utils ) +DEPEND=app-arch/cpio bzip2? ( app-arch/bzip2 ) gzip? ( app-arch/gzip ) lzma? ( app-arch/xz-utils ) lzo? ( app-arch/lzop ) DESCRIPTION=build initramfs -EAPI=4 +EAPI=5 HOMEPAGE=http://formilux.org -IUSE=bzip2 gzip lzma lzo xz +IUSE=bzip2 gzip lzma lzo KEYWORDS=~amd64 ~x86 LICENSE=public-domain SLOT=0 _eclasses_=flx-tools 16dcddd69d5b4139939969e95fce38b0 -_md5_=365a05dc5664d4efc02c126100be7118 +_md5_=ce43d01febf59a9afc5f5ae9298ef21b diff --git a/profiles/use.local.desc b/profiles/use.local.desc index df2a4860..7f501ae9 100644 --- a/profiles/use.local.desc +++ b/profiles/use.local.desc @@ -59,7 +59,6 @@ dev-libs/dietlibc:target_sparc64 - Support SPARC64 target dev-libs/dietlibc:target_x86_64 - Support amd64 target dev-libs/glib:systemtap - Build support for profiling and tracing using dev-util/systemtap dev-libs/glib:utils - Install gtester-report utility to generate test report files for your software. -flx/initramfs:xz - Compress using XZ/LZMA algorithm media-sound/pulseaudio:X - Build the X11 publish module to export PulseAudio information through X11 protocol for clients to make use. Don't enable this flag if you want to use a system wide instance. If unsure, enable this flag. media-sound/pulseaudio:asyncns - Use libasyncns for asynchronous name resolution. media-sound/pulseaudio:doc - Build the doxygen-described API documentation. -- cgit v1.2.3