From patchwork Sun Aug 12 06:44:37 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan Liu X-Patchwork-Id: 176774 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ozlabs.org (Postfix) with ESMTP id 5209D2C008E for ; Sun, 12 Aug 2012 16:44:24 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id AC7328C901; Sun, 12 Aug 2012 06:44:18 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id ExFc9xgpT3yR; Sun, 12 Aug 2012 06:44:14 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 626DE8C7BF; Sun, 12 Aug 2012 06:44:13 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (silver.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id 6BBB38F753 for ; Sun, 12 Aug 2012 06:44:12 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 687D025180 for ; Sun, 12 Aug 2012 06:44:12 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id uVkJaI8CwWew for ; Sun, 12 Aug 2012 06:44:11 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-pb0-f46.google.com (mail-pb0-f46.google.com [209.85.160.46]) by silver.osuosl.org (Postfix) with ESMTPS id 7FCC924993 for ; Sun, 12 Aug 2012 06:44:11 +0000 (UTC) Received: by pbbrr13 with SMTP id rr13so5368739pbb.33 for ; Sat, 11 Aug 2012 23:44:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:subject:date:message-id:x-mailer; bh=5lCuicF+Bi3W/hqlmL+ouDPeDUGUPt5dVmI7EhDJ04s=; b=H7oUh/NFmXu0vjOAepGMzarqhwyqReLWqfP4umFMx/0l9gnEnW/usSn1neHMPdM+aT ZNqJmKn1A8i8F2aFokmGfq1wgYaWjh24+XgQm3+SCLyh6bNdxTqL0H6WgnsoEgZYUTkQ CoWquZj6ZSrfrx7vPyYd+/QCU1Bf2XNqOvDlREO52TiW3zgBFla63Ey3H+cyuIPOlJ5f NKmiPrFOCxrtBXbUWT20YQYKl6VgZ7NaGrtmTUx7ww+kUPCm2PKUPKr3KE0Tax9qXyQp pr2y+a7L0+DD74ATZm2SRbrFULdnIAO9sXjPt/6pEf4j1Jr0/ALC7cFV3ckvjudyvSGs gcXw== Received: by 10.68.217.202 with SMTP id pa10mr10153513pbc.15.1344753851227; Sat, 11 Aug 2012 23:44:11 -0700 (PDT) Received: from 60-242-179-244.static.tpgi.com.au (60-242-179-244.static.tpgi.com.au. [60.242.179.244]) by mx.google.com with ESMTPS id os1sm2805707pbc.31.2012.08.11.23.44.07 (version=TLSv1/SSLv3 cipher=OTHER); Sat, 11 Aug 2012 23:44:09 -0700 (PDT) From: Jonathan Liu To: buildroot@uclibc.org Date: Sun, 12 Aug 2012 16:44:37 +1000 Message-Id: <1344753877-30117-1-git-send-email-net147@gmail.com> X-Mailer: git-send-email 1.7.11.3 Subject: [Buildroot] [PATCH v2] p7zip-light: new package X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.14 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: buildroot-bounces@busybox.net Signed-off-by: Jonathan Liu --- package/Config.in | 1 + package/p7zip-light/Config.in | 29 +++++++ package/p7zip-light/p7zip-light-disable-rar.patch | 96 ++++++++++++++++++++++ package/p7zip-light/p7zip-light-trim-install.patch | 34 ++++++++ package/p7zip-light/p7zip-light.mk | 31 +++++++ 5 files changed, 191 insertions(+) create mode 100644 package/p7zip-light/Config.in create mode 100644 package/p7zip-light/p7zip-light-disable-rar.patch create mode 100644 package/p7zip-light/p7zip-light-trim-install.patch create mode 100644 package/p7zip-light/p7zip-light.mk diff --git a/package/Config.in b/package/Config.in index f308de7..fceedd4 100644 --- a/package/Config.in +++ b/package/Config.in @@ -13,6 +13,7 @@ source "package/gzip/Config.in" endif source "package/lzop/Config.in" source "package/lzma/Config.in" +source "package/p7zip-light/Config.in" source "package/xz/Config.in" endmenu diff --git a/package/p7zip-light/Config.in b/package/p7zip-light/Config.in new file mode 100644 index 0000000..d1ed50a --- /dev/null +++ b/package/p7zip-light/Config.in @@ -0,0 +1,29 @@ +config BR2_PACKAGE_P7ZIP_LIGHT + bool "p7zip-light" + help + Command-line version of the 7-Zip compressed file archiver + without RAR and GUI support. + + http://p7zip.sourceforge.net/ + +if BR2_PACKAGE_P7ZIP_LIGHT + +config BR2_PACKAGE_P7ZIP_LIGHT_SFX + bool "SFX support" + default n + help + Enable support for creating self-extracting archives. + +config BR2_PACKAGE_P7ZIP_LIGHT_7Z + bool "7z" + default n + help + Build 7z executable. Uses plugins to handle archives. + +config BR2_PACKAGE_P7ZIP_LIGHT_7ZR + bool "7zr" + default n + help + Build 7zr executable. Only supports 7z archives. + +endif diff --git a/package/p7zip-light/p7zip-light-disable-rar.patch b/package/p7zip-light/p7zip-light-disable-rar.patch new file mode 100644 index 0000000..3d5144b --- /dev/null +++ b/package/p7zip-light/p7zip-light-disable-rar.patch @@ -0,0 +1,96 @@ +diff -Nur p7zip_9.20.1.orig/CPP/7zip/Bundles/Format7zFree/makefile p7zip_9.20.1/CPP/7zip/Bundles/Format7zFree/makefile +--- p7zip_9.20.1.orig/CPP/7zip/Bundles/Format7zFree/makefile 2010-11-08 02:41:43.000000000 +1100 ++++ p7zip_9.20.1/CPP/7zip/Bundles/Format7zFree/makefile 2012-08-12 16:07:11.324018639 +1000 +@@ -158,14 +158,6 @@ + NsisIn.o \ + NsisRegister.o \ + +-RAR_OBJS = \ +- RarHandler.o \ +- RarHeader.o \ +- RarIn.o \ +- RarItem.o \ +- RarVolumeInStream.o \ +- RarRegister.o \ +- + TAR_OBJS = \ + TarHandler.o \ + TarHandlerOut.o \ +@@ -257,8 +249,6 @@ + MyAes.o \ + Pbkdf2HmacSha1.o \ + RandGen.o \ +- Rar20Crypto.o \ +- RarAes.o \ + Sha1.o \ + WzAes.o \ + ZipCrypto.o \ +@@ -314,7 +304,6 @@ + $(HFS_OBJS) \ + $(ISO_OBJS) \ + $(NSIS_OBJS) \ +- $(RAR_OBJS) \ + $(TAR_OBJS) \ + $(UDF_OBJS) \ + $(WIM_OBJS) \ +diff -Nur p7zip_9.20.1.orig/makefile p7zip_9.20.1/makefile +--- p7zip_9.20.1.orig/makefile 2011-03-13 22:52:45.000000000 +1100 ++++ p7zip_9.20.1/makefile 2012-08-12 16:04:23.665309025 +1000 +@@ -56,7 +56,6 @@ + $(MAKE) -C CPP/7zip/UI/Client7z depend + $(MAKE) -C CPP/7zip/UI/Console depend + $(MAKE) -C CPP/7zip/Bundles/Format7zFree depend +- $(MAKE) -C CPP/7zip/Compress/Rar depend + $(MAKE) -C CPP/7zip/UI/GUI depend + $(MAKE) -C CPP/7zip/UI/FileManager depend + $(MAKE) -C check/my_86_filter depend +@@ -68,7 +67,6 @@ + common7z:common + $(MKDIR) bin/Codecs + $(MAKE) -C CPP/7zip/Bundles/Format7zFree all +- $(MAKE) -C CPP/7zip/Compress/Rar all + + 7z: common7z + $(MAKE) -C CPP/7zip/UI/Console all +@@ -93,7 +91,6 @@ + $(MAKE) -C CPP/7zip/UI/FileManager clean + $(MAKE) -C CPP/7zip/UI/GUI clean + $(MAKE) -C CPP/7zip/Bundles/Format7zFree clean +- $(MAKE) -C CPP/7zip/Compress/Rar clean + $(MAKE) -C CPP/7zip/Compress/LZMA_Alone clean + $(MAKE) -C CPP/7zip/Bundles/AloneGCOV clean + $(MAKE) -C CPP/7zip/TEST/TestUI clean +diff -Nur p7zip_9.20.1.orig/makefile.rules p7zip_9.20.1/makefile.rules +--- p7zip_9.20.1.orig/makefile.rules 2010-11-08 03:08:51.000000000 +1100 ++++ p7zip_9.20.1/makefile.rules 2012-08-12 16:07:41.905875384 +1000 +@@ -448,19 +448,6 @@ + NsisRegister.o : ../../Archive/Nsis/NsisRegister.cpp + $(CXX) $(CXXFLAGS) ../../Archive/Nsis/NsisRegister.cpp + +-RarHandler.o : ../../Archive/Rar/RarHandler.cpp +- $(CXX) $(CXXFLAGS) ../../Archive/Rar/RarHandler.cpp +-RarHeader.o : ../../Archive/Rar/RarHeader.cpp +- $(CXX) $(CXXFLAGS) ../../Archive/Rar/RarHeader.cpp +-RarIn.o : ../../Archive/Rar/RarIn.cpp +- $(CXX) $(CXXFLAGS) ../../Archive/Rar/RarIn.cpp +-RarItem.o : ../../Archive/Rar/RarItem.cpp +- $(CXX) $(CXXFLAGS) ../../Archive/Rar/RarItem.cpp +-RarVolumeInStream.o : ../../Archive/Rar/RarVolumeInStream.cpp +- $(CXX) $(CXXFLAGS) ../../Archive/Rar/RarVolumeInStream.cpp +-RarRegister.o : ../../Archive/Rar/RarRegister.cpp +- $(CXX) $(CXXFLAGS) ../../Archive/Rar/RarRegister.cpp +- + UdfHandler.o : ../../Archive/Udf/UdfHandler.cpp + $(CXX) $(CXXFLAGS) ../../Archive/Udf/UdfHandler.cpp + UdfIn.o : ../../Archive/Udf/UdfIn.cpp +@@ -535,10 +522,6 @@ + $(CXX) $(CXXFLAGS) ../../Crypto/7zAesRegister.cpp + WzAes.o : ../../Crypto/WzAes.cpp + $(CXX) $(CXXFLAGS) ../../Crypto/WzAes.cpp +-Rar20Crypto.o : ../../Crypto/Rar20Crypto.cpp +- $(CXX) $(CXXFLAGS) ../../Crypto/Rar20Crypto.cpp +-RarAes.o : ../../Crypto/RarAes.cpp +- $(CXX) $(CXXFLAGS) ../../Crypto/RarAes.cpp + HmacSha1.o : ../../Crypto/HmacSha1.cpp + $(CXX) $(CXXFLAGS) ../../Crypto/HmacSha1.cpp + Pbkdf2HmacSha1.o : ../../Crypto/Pbkdf2HmacSha1.cpp diff --git a/package/p7zip-light/p7zip-light-trim-install.patch b/package/p7zip-light/p7zip-light-trim-install.patch new file mode 100644 index 0000000..884e57c --- /dev/null +++ b/package/p7zip-light/p7zip-light-trim-install.patch @@ -0,0 +1,34 @@ +diff -Nur p7zip_9.20.1.orig/install.sh p7zip_9.20.1/install.sh +--- p7zip_9.20.1.orig/install.sh 2011-03-17 06:32:56.000000000 +1100 ++++ p7zip_9.20.1/install.sh 2012-08-12 16:30:30.452439065 +1000 +@@ -104,12 +104,14 @@ + chmod 555 "${DEST_DIR}${DEST_SHARE}/7z.so" + fi + ++:<