From 28e9a68b020cdbde0e1e71a4967bee0bc26a0890 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sat, 29 Mar 2014 10:33:08 +0100 Subject: use xz instead of gzip, remove grub for qemu, add it only to ibm-x40 --- package/grub-bin/Makefile | 1 - scripts/tarpkg | 4 ++-- target/arm/sys-available/toolchain-arm | 2 +- target/arm/sys-available/toolchain-armhf | 2 +- target/config/Config.in | 7 ++++--- target/m68k/sys-available/toolchain-m68k | 2 +- target/microblaze/sys-available/toolchain-microblaze | 2 +- target/microblaze/sys-available/toolchain-microblazeel | 2 +- target/mips/sys-available/toolchain-mips | 2 +- target/mips/sys-available/toolchain-mips64 | 2 +- target/mips/sys-available/toolchain-mips64el | 2 +- target/mips/sys-available/toolchain-mips64eln32 | 2 +- target/mips/sys-available/toolchain-mips64eln64 | 2 +- target/mips/sys-available/toolchain-mips64n32 | 2 +- target/mips/sys-available/toolchain-mips64n64 | 2 +- target/mips/sys-available/toolchain-mipsel | 2 +- target/packages/pkg-available/test | 1 + target/ppc/sys-available/toolchain-ppc | 2 +- target/ppc64/sys-available/toolchain-ppc64 | 2 +- target/sh/sys-available/toolchain-sh | 2 +- target/sh/sys-available/toolchain-sheb | 2 +- target/sparc/sys-available/toolchain-sparc | 2 +- target/sparc64/sys-available/toolchain-sparc64 | 2 +- target/x86/sys-available/ibm-x40 | 1 + target/x86/sys-available/toolchain-i686 | 2 +- target/x86_64/sys-available/toolchain-x86_64 | 2 +- target/x86_64/sys-available/toolchain-x86_64_32 | 2 +- target/x86_64/sys-available/toolchain-x86_64_x32 | 2 +- 28 files changed, 31 insertions(+), 29 deletions(-) diff --git a/package/grub-bin/Makefile b/package/grub-bin/Makefile index 7b52cdafa..352c2b572 100644 --- a/package/grub-bin/Makefile +++ b/package/grub-bin/Makefile @@ -18,7 +18,6 @@ PKG_ARCH_DEPENDS:= x86 x86_64 PKG_CFLINE_GRUB_BIN:= select BUSYBOX_FEATURE_STAT_FORMAT@ PKG_CFLINE_GRUB_BIN+= depends on !ADK_TARGET_ROOTFS_INITRAMFS_PIGGYBACK && !ADK_TARGET_ROOTFS_INITRAMFS -PKG_DFLT_GRUB_BIN:= y if !ADK_TOOLCHAIN_ONLY && !ADK_TOOLCHAIN_ARCHIVE include ${TOPDIR}/mk/package.mk diff --git a/scripts/tarpkg b/scripts/tarpkg index 37c0b2079..40342d401 100755 --- a/scripts/tarpkg +++ b/scripts/tarpkg @@ -16,14 +16,14 @@ if [ "$1" = "build" ];then chmod +x ${2}/usr/lib/pkg/${pkgname}.$file ) done rm -rf $2/CONTROL - (cd $2 && tar -czf $3/${pkgname}_${version}_${arch}.tar.gz .) + (cd $2 && tar -cJf $3/${pkgname}_${version}_${arch}.tar.xz .) elif [ "$1" = "install" ];then pkg=$(echo $(basename $2)|sed -e "s#_.*##") if [ -x ${PKG_INSTROOT}/usr/lib/pkg/${pkg}.preinst ]; then IPKG_INSTROOT="$PKG_INSTROOT" ${PKG_INSTROOT}/usr/lib/pkg/${pkg}.preinst rm ${PKG_INSTROOT}/usr/lib/pkg/${pkg}.preinst fi - tar -xzpf $2 -C ${PKG_INSTROOT} + tar -xJpf $2 -C ${PKG_INSTROOT} if [ -x ${PKG_INSTROOT}/usr/lib/pkg/${pkg}.postinst ]; then IPKG_INSTROOT="$PKG_INSTROOT" ${PKG_INSTROOT}/usr/lib/pkg/${pkg}.postinst rm ${PKG_INSTROOT}/usr/lib/pkg/${pkg}.postinst diff --git a/target/arm/sys-available/toolchain-arm b/target/arm/sys-available/toolchain-arm index 3ad081933..b9ba30aa5 100644 --- a/target/arm/sys-available/toolchain-arm +++ b/target/arm/sys-available/toolchain-arm @@ -7,7 +7,7 @@ config ADK_TARGET_SYSTEM_TOOLCHAIN_ARM select ADK_fpu_vfp select ADK_eabi select ADK_TOOLCHAIN - select ADK_TARGET_PACKAGE_TGZ + select ADK_TARGET_PACKAGE_TXZ select ADK_CPU_CORTEX_A9 help ARM toolchain (soft float) for Cortex A9. diff --git a/target/arm/sys-available/toolchain-armhf b/target/arm/sys-available/toolchain-armhf index 8a2db49a8..252a41aa2 100644 --- a/target/arm/sys-available/toolchain-armhf +++ b/target/arm/sys-available/toolchain-armhf @@ -7,7 +7,7 @@ config ADK_TARGET_SYSTEM_TOOLCHAIN_ARMHF select ADK_fpu_vfp select ADK_toolchain_armhf select ADK_TOOLCHAIN - select ADK_TARGET_PACKAGE_TGZ + select ADK_TARGET_PACKAGE_TXZ select ADK_CPU_CORTEX_A9 help ARM toolchain (hard float) for Cortex A9. diff --git a/target/config/Config.in b/target/config/Config.in index 9429b5072..5c1874264 100644 --- a/target/config/Config.in +++ b/target/config/Config.in @@ -945,11 +945,12 @@ config ADK_TARGET_ROOTFS config ADK_PACKAGE_SUFFIX string default "ipk" if ADK_TARGET_PACKAGE_IPKG - default "tar.gz" if ADK_TARGET_PACKAGE_TGZ + default "tar.xz" if ADK_TARGET_PACKAGE_TXZ help choice prompt "Target package format" +default ADK_TARGET_PACKAGE_TXZ if ADK_PKG_TEST default ADK_TARGET_PACKAGE_IPKG depends on !ADK_CHOOSE_TARGET_SYSTEM && !ADK_CHOOSE_TARGET_ARCH @@ -960,9 +961,9 @@ config ADK_TARGET_PACKAGE_IPKG help Create ipkg packages and use ipkg package management on the target. -config ADK_TARGET_PACKAGE_TGZ +config ADK_TARGET_PACKAGE_TXZ boolean - prompt "tar archive" + prompt "xz compressed tar archive" help Create compressed tar archives of packages. Pre- and post install scripts will be executed in the target diff --git a/target/m68k/sys-available/toolchain-m68k b/target/m68k/sys-available/toolchain-m68k index 0bc27683b..b48c9b784 100644 --- a/target/m68k/sys-available/toolchain-m68k +++ b/target/m68k/sys-available/toolchain-m68k @@ -3,7 +3,7 @@ config ADK_TARGET_SYSTEM_TOOLCHAIN_M68K select ADK_m68k select ADK_toolchain_m68k select ADK_TOOLCHAIN - select ADK_TARGET_PACKAGE_TGZ + select ADK_TARGET_PACKAGE_TXZ help Build a m68k toolchain. diff --git a/target/microblaze/sys-available/toolchain-microblaze b/target/microblaze/sys-available/toolchain-microblaze index 6fb76c5f5..3b8d3512b 100644 --- a/target/microblaze/sys-available/toolchain-microblaze +++ b/target/microblaze/sys-available/toolchain-microblaze @@ -4,7 +4,7 @@ config ADK_TARGET_SYSTEM_TOOLCHAIN_MICROBLAZE select ADK_big select ADK_toolchain_microblaze select ADK_TOOLCHAIN - select ADK_TARGET_PACKAGE_TGZ + select ADK_TARGET_PACKAGE_TXZ help Microblaze toolchain. diff --git a/target/microblaze/sys-available/toolchain-microblazeel b/target/microblaze/sys-available/toolchain-microblazeel index 8992e5550..c41e26f91 100644 --- a/target/microblaze/sys-available/toolchain-microblazeel +++ b/target/microblaze/sys-available/toolchain-microblazeel @@ -4,7 +4,7 @@ config ADK_TARGET_SYSTEM_TOOLCHAIN_MICROBLAZEEL select ADK_little select ADK_toolchain_microblazeel select ADK_TOOLCHAIN - select ADK_TARGET_PACKAGE_TGZ + select ADK_TARGET_PACKAGE_TXZ help Microblaze toolchain. diff --git a/target/mips/sys-available/toolchain-mips b/target/mips/sys-available/toolchain-mips index 55a2e9e7d..7c7e1c142 100644 --- a/target/mips/sys-available/toolchain-mips +++ b/target/mips/sys-available/toolchain-mips @@ -4,7 +4,7 @@ config ADK_TARGET_SYSTEM_TOOLCHAIN_MIPS select ADK_big select ADK_toolchain_mips select ADK_TOOLCHAIN - select ADK_TARGET_PACKAGE_TGZ + select ADK_TARGET_PACKAGE_TXZ help MIPS32 big endian toolchain. diff --git a/target/mips/sys-available/toolchain-mips64 b/target/mips/sys-available/toolchain-mips64 index e9ea69170..f1cc555a2 100644 --- a/target/mips/sys-available/toolchain-mips64 +++ b/target/mips/sys-available/toolchain-mips64 @@ -7,6 +7,6 @@ config ADK_TARGET_SYSTEM_TOOLCHAIN_MIPS64 select ADK_CPU_MIPS64 select ADK_LINUX_64 select ADK_TOOLCHAIN - select ADK_TARGET_PACKAGE_TGZ + select ADK_TARGET_PACKAGE_TXZ help MIPS64 big endian o32 ABI toolchain. diff --git a/target/mips/sys-available/toolchain-mips64el b/target/mips/sys-available/toolchain-mips64el index 0d54692ee..7aa82f05d 100644 --- a/target/mips/sys-available/toolchain-mips64el +++ b/target/mips/sys-available/toolchain-mips64el @@ -7,6 +7,6 @@ config ADK_TARGET_SYSTEM_TOOLCHAIN_MIPS64EL select ADK_CPU_MIPS64 select ADK_LINUX_64 select ADK_TOOLCHAIN - select ADK_TARGET_PACKAGE_TGZ + select ADK_TARGET_PACKAGE_TXZ help MIPS64 little endian o32 ABI toolchain. diff --git a/target/mips/sys-available/toolchain-mips64eln32 b/target/mips/sys-available/toolchain-mips64eln32 index 9c0f44381..96f409ba6 100644 --- a/target/mips/sys-available/toolchain-mips64eln32 +++ b/target/mips/sys-available/toolchain-mips64eln32 @@ -7,6 +7,6 @@ config ADK_TARGET_SYSTEM_TOOLCHAIN_MIPS64ELN32 select ADK_CPU_MIPS64 select ADK_LINUX_64 select ADK_TOOLCHAIN - select ADK_TARGET_PACKAGE_TGZ + select ADK_TARGET_PACKAGE_TXZ help MIPS64 little endian n32 ABI toolchain. diff --git a/target/mips/sys-available/toolchain-mips64eln64 b/target/mips/sys-available/toolchain-mips64eln64 index 2795598d8..f28b14997 100644 --- a/target/mips/sys-available/toolchain-mips64eln64 +++ b/target/mips/sys-available/toolchain-mips64eln64 @@ -7,6 +7,6 @@ config ADK_TARGET_SYSTEM_TOOLCHAIN_MIPS64ELN64 select ADK_CPU_MIPS64 select ADK_LINUX_64 select ADK_TOOLCHAIN - select ADK_TARGET_PACKAGE_TGZ + select ADK_TARGET_PACKAGE_TXZ help MIPS64 little endian n64 ABI toolchain. diff --git a/target/mips/sys-available/toolchain-mips64n32 b/target/mips/sys-available/toolchain-mips64n32 index e2acd59b3..1337d3e37 100644 --- a/target/mips/sys-available/toolchain-mips64n32 +++ b/target/mips/sys-available/toolchain-mips64n32 @@ -7,6 +7,6 @@ config ADK_TARGET_SYSTEM_TOOLCHAIN_MIPS64N32 select ADK_CPU_MIPS64 select ADK_LINUX_64 select ADK_TOOLCHAIN - select ADK_TARGET_PACKAGE_TGZ + select ADK_TARGET_PACKAGE_TXZ help MIPS64 big endian n64 ABI toolchain. diff --git a/target/mips/sys-available/toolchain-mips64n64 b/target/mips/sys-available/toolchain-mips64n64 index e544008f4..4cb4939e5 100644 --- a/target/mips/sys-available/toolchain-mips64n64 +++ b/target/mips/sys-available/toolchain-mips64n64 @@ -7,6 +7,6 @@ config ADK_TARGET_SYSTEM_TOOLCHAIN_MIPS64N64 select ADK_CPU_MIPS64 select ADK_LINUX_64 select ADK_TOOLCHAIN - select ADK_TARGET_PACKAGE_TGZ + select ADK_TARGET_PACKAGE_TXZ help MIPS64 big endian n64 ABI toolchain. diff --git a/target/mips/sys-available/toolchain-mipsel b/target/mips/sys-available/toolchain-mipsel index e850d7116..4032f9d94 100644 --- a/target/mips/sys-available/toolchain-mipsel +++ b/target/mips/sys-available/toolchain-mipsel @@ -4,7 +4,7 @@ config ADK_TARGET_SYSTEM_TOOLCHAIN_MIPSEL select ADK_little select ADK_toolchain_mipsel select ADK_TOOLCHAIN - select ADK_TARGET_PACKAGE_TGZ + select ADK_TARGET_PACKAGE_TXZ help MIPS32 little endian toolchain. diff --git a/target/packages/pkg-available/test b/target/packages/pkg-available/test index 7bbbe5310..5ffe80949 100644 --- a/target/packages/pkg-available/test +++ b/target/packages/pkg-available/test @@ -10,6 +10,7 @@ config ADK_PKG_TEST select ADK_KERNEL_INITRAMFS_COMPRESSION_XZ select ADK_SIMPLE_NETWORK_CONFIG select ADK_KPACKAGE_KMOD_IPV6 + select ADK_TARGET_PACKAGE_TXZ default n help Package collection used to build adk-test-framework root diff --git a/target/ppc/sys-available/toolchain-ppc b/target/ppc/sys-available/toolchain-ppc index 54e35e6a5..dd432ecda 100644 --- a/target/ppc/sys-available/toolchain-ppc +++ b/target/ppc/sys-available/toolchain-ppc @@ -4,7 +4,7 @@ config ADK_TARGET_SYSTEM_TOOLCHAIN_PPC select ADK_toolchain_ppc select ADK_CPU_PPC select ADK_TOOLCHAIN - select ADK_TARGET_PACKAGE_TGZ + select ADK_TARGET_PACKAGE_TXZ help Build a ppc toolchain. diff --git a/target/ppc64/sys-available/toolchain-ppc64 b/target/ppc64/sys-available/toolchain-ppc64 index 50e72654a..dce18a3a3 100644 --- a/target/ppc64/sys-available/toolchain-ppc64 +++ b/target/ppc64/sys-available/toolchain-ppc64 @@ -5,7 +5,7 @@ config ADK_TARGET_SYSTEM_TOOLCHAIN_PPC64 select ADK_CPU_PPC64 select ADK_LINUX_64 select ADK_TOOLCHAIN - select ADK_TARGET_PACKAGE_TGZ + select ADK_TARGET_PACKAGE_TXZ help Build a ppc64 toolchain. diff --git a/target/sh/sys-available/toolchain-sh b/target/sh/sys-available/toolchain-sh index 287401079..b9dedcfd2 100644 --- a/target/sh/sys-available/toolchain-sh +++ b/target/sh/sys-available/toolchain-sh @@ -5,7 +5,7 @@ config ADK_TARGET_SYSTEM_TOOLCHAIN_SH select ADK_toolchain_sh select ADK_CPU_SH4 select ADK_TOOLCHAIN - select ADK_TARGET_PACKAGE_TGZ + select ADK_TARGET_PACKAGE_TXZ help Build a superh toolchain (sh4). diff --git a/target/sh/sys-available/toolchain-sheb b/target/sh/sys-available/toolchain-sheb index 236d4e486..f61547d24 100644 --- a/target/sh/sys-available/toolchain-sheb +++ b/target/sh/sys-available/toolchain-sheb @@ -5,7 +5,7 @@ config ADK_TARGET_SYSTEM_TOOLCHAIN_SHEB select ADK_toolchain_sheb select ADK_CPU_SH4 select ADK_TOOLCHAIN - select ADK_TARGET_PACKAGE_TGZ + select ADK_TARGET_PACKAGE_TXZ help Build a superh toolchain (sh4 big endian). diff --git a/target/sparc/sys-available/toolchain-sparc b/target/sparc/sys-available/toolchain-sparc index e668592e2..e7f5aafc4 100644 --- a/target/sparc/sys-available/toolchain-sparc +++ b/target/sparc/sys-available/toolchain-sparc @@ -4,7 +4,7 @@ config ADK_TARGET_SYSTEM_TOOLCHAIN_SPARC select ADK_toolchain_sparc select ADK_CPU_SPARC_V8 select ADK_TOOLCHAIN - select ADK_TARGET_PACKAGE_TGZ + select ADK_TARGET_PACKAGE_TXZ help Build a sparc toolchain. diff --git a/target/sparc64/sys-available/toolchain-sparc64 b/target/sparc64/sys-available/toolchain-sparc64 index 1abcef8f2..a83ecd198 100644 --- a/target/sparc64/sys-available/toolchain-sparc64 +++ b/target/sparc64/sys-available/toolchain-sparc64 @@ -5,7 +5,7 @@ config ADK_TARGET_SYSTEM_TOOLCHAIN_SPARC64 select ADK_CPU_SPARC_V9 select ADK_LINUX_64 select ADK_TOOLCHAIN - select ADK_TARGET_PACKAGE_TGZ + select ADK_TARGET_PACKAGE_TXZ help Build a sparc64 toolchain. diff --git a/target/x86/sys-available/ibm-x40 b/target/x86/sys-available/ibm-x40 index ef6e20a8a..f55b1f622 100644 --- a/target/x86/sys-available/ibm-x40 +++ b/target/x86/sys-available/ibm-x40 @@ -22,5 +22,6 @@ config ADK_TARGET_SYSTEM_IBM_X40 select ADK_TARGET_WITH_PP select ADK_TARGET_WITH_ROOT_RW select ADK_TARGET_KERNEL_BZIMAGE + select ADK_PACKAGE_GRUB_BIN help System profile for IBM X40 laptop. diff --git a/target/x86/sys-available/toolchain-i686 b/target/x86/sys-available/toolchain-i686 index bec515fca..b7c3be238 100644 --- a/target/x86/sys-available/toolchain-i686 +++ b/target/x86/sys-available/toolchain-i686 @@ -4,7 +4,7 @@ config ADK_TARGET_SYSTEM_TOOLCHAIN_X86 select ADK_toolchain_x86 select ADK_CPU_I686 select ADK_TOOLCHAIN - select ADK_TARGET_PACKAGE_TGZ + select ADK_TARGET_PACKAGE_TXZ help Build a x86 toolchain (i686 optimized). diff --git a/target/x86_64/sys-available/toolchain-x86_64 b/target/x86_64/sys-available/toolchain-x86_64 index e71829085..b93b479a1 100644 --- a/target/x86_64/sys-available/toolchain-x86_64 +++ b/target/x86_64/sys-available/toolchain-x86_64 @@ -6,7 +6,7 @@ config ADK_TARGET_SYSTEM_TOOLCHAIN_X86_64 select ADK_CPU_X86_64 select ADK_LINUX_64 select ADK_TOOLCHAIN - select ADK_TARGET_PACKAGE_TGZ + select ADK_TARGET_PACKAGE_TXZ help Build a x86_64 toolchain. diff --git a/target/x86_64/sys-available/toolchain-x86_64_32 b/target/x86_64/sys-available/toolchain-x86_64_32 index 501c31050..9e8297ea4 100644 --- a/target/x86_64/sys-available/toolchain-x86_64_32 +++ b/target/x86_64/sys-available/toolchain-x86_64_32 @@ -6,7 +6,7 @@ config ADK_TARGET_SYSTEM_TOOLCHAIN_X86_64_32 select ADK_CPU_X86_64 select ADK_LINUX_64 select ADK_TOOLCHAIN - select ADK_TARGET_PACKAGE_TGZ + select ADK_TARGET_PACKAGE_TXZ help Build a x86_64 toolchain. diff --git a/target/x86_64/sys-available/toolchain-x86_64_x32 b/target/x86_64/sys-available/toolchain-x86_64_x32 index 090d474b6..22d94171f 100644 --- a/target/x86_64/sys-available/toolchain-x86_64_x32 +++ b/target/x86_64/sys-available/toolchain-x86_64_x32 @@ -6,7 +6,7 @@ config ADK_TARGET_SYSTEM_TOOLCHAIN_X86_64_X32 select ADK_CPU_X86_64 select ADK_LINUX_64 select ADK_TOOLCHAIN - select ADK_TARGET_PACKAGE_TGZ + select ADK_TARGET_PACKAGE_TXZ help Build a x86_64 toolchain. -- cgit v1.2.3