Browse Source

use xz instead of gzip, remove grub for qemu, add it only to ibm-x40

Waldemar Brodkorb 10 years ago
parent
commit
28e9a68b02

+ 0 - 1
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
 

+ 2 - 2
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

+ 1 - 1
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.

+ 1 - 1
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.

+ 4 - 3
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

+ 1 - 1
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.
 

+ 1 - 1
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.
 

+ 1 - 1
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.
 

+ 1 - 1
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.
 

+ 1 - 1
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.

+ 1 - 1
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.

+ 1 - 1
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.

+ 1 - 1
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.

+ 1 - 1
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.

+ 1 - 1
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.

+ 1 - 1
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.
 

+ 1 - 0
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

+ 1 - 1
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.
 

+ 1 - 1
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.
 

+ 1 - 1
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).
 

+ 1 - 1
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).
 

+ 1 - 1
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.
 

+ 1 - 1
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.
 

+ 1 - 0
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.

+ 1 - 1
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).
 

+ 1 - 1
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.
 

+ 1 - 1
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.
 

+ 1 - 1
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.