From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 9C32F1381F3 for ; Sun, 9 Jun 2013 13:17:24 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 32AF7E084C; Sun, 9 Jun 2013 13:17:24 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 9486DE07FA for ; Sun, 9 Jun 2013 13:17:23 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id AAD3D33E328 for ; Sun, 9 Jun 2013 13:17:22 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 53833E468F for ; Sun, 9 Jun 2013 13:17:21 +0000 (UTC) From: "Richard Yao" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Richard Yao" Message-ID: <1370783794.7d962cfb9904419a9a31b4b5a8d572f49afe2682.ryao@gentoo> Subject: [gentoo-commits] proj/genkernel:ryao commit in: / X-VCS-Repository: proj/genkernel X-VCS-Files: gen_initramfs.sh X-VCS-Directories: / X-VCS-Committer: ryao X-VCS-Committer-Name: Richard Yao X-VCS-Revision: 7d962cfb9904419a9a31b4b5a8d572f49afe2682 X-VCS-Branch: ryao Date: Sun, 9 Jun 2013 13:17:21 +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: 996ba63e-fdda-453e-8251-67ab79d9c2a0 X-Archives-Hash: f5dd9623b2ec741224cd0ce31e490ef0 commit: 7d962cfb9904419a9a31b4b5a8d572f49afe2682 Author: Richard Yao gentoo org> AuthorDate: Thu Jun 6 03:14:18 2013 +0000 Commit: Richard Yao gentoo org> CommitDate: Sun Jun 9 13:16:34 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=7d962cfb Remove duplicate files from initramfs genkernel's initramfs image is built incrementally by appending to the cpio file. The introduction of copy_binaries resulted in copying libraries from the host system, which causes the cpio to include certain libraries multiple times whenever different stages depended upon the same library. We address this by extracting the cpio to a temporary directory and then compressing it again to "finalize" it. The extraction eliminates the duplicate files. This makes generated initramfs images slightly smaller and in theory, should make the initramfs load slightly faster. Signed-off-by: Richard Yao gentoo.org> --- gen_initramfs.sh | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/gen_initramfs.sh b/gen_initramfs.sh index 745e15a..d76aa55 100755 --- a/gen_initramfs.sh +++ b/gen_initramfs.sh @@ -796,6 +796,20 @@ create_initramfs() { append_data 'overlay' fi + # Finalize cpio by removing duplicate files + print_info 1 " >> Finalizing cpio..." + local TDIR="${TEMP}/initramfs-final" + mkdir -p "${TDIR}" + cd "${TDIR}" + + cpio --quiet -i -F "${CPIO}" 2> /dev/null \ + || gen_die "extracting cpio for finalization" + find . -print | cpio ${CPIO_ARGS} -F "${CPIO}" 2>/dev/null \ + || gen_die "recompressing cpio" + + cd "${TEMP}" + rm -r "${TDIR}" + if isTrue "${INTEGRATED_INITRAMFS}" then # Explicitly do not compress if we are integrating into the kernel.