Browse Source

fix initrdramfsarchive target

Waldemar Brodkorb 10 years ago
parent
commit
0ddf6b3891
2 changed files with 1 additions and 9 deletions
  1. 0 9
      mk/build.mk
  2. 1 0
      target/config/Config.in.target

+ 0 - 9
mk/build.mk

@@ -350,17 +350,11 @@ endif
 	fi
 	@if [ ! -z "$(ADK_LTP)" ];then \
 		echo "ADK_PACKAGE_LTP=y" >> $(ADK_TOPDIR)/.defconfig; \
-		echo "ADK_KERNEL_BLK_DEV_INITRD=y" >> $(ADK_TOPDIR)/.defconfig; \
-		echo "ADK_KERNEL_COMP_XZ=y" >> $(ADK_TOPDIR)/.defconfig; \
-		echo "ADK_KERNEL_INITRAMFS_COMPRESSION_XZ=y" >> $(ADK_TOPDIR)/.defconfig; \
 		echo "ADK_KERNEL_IPV6=y" >> $(ADK_TOPDIR)/.defconfig; \
 	fi
 	@if [ ! -z "$(ADK_UCLIBC_TEST)" ];then \
 		echo "ADK_PACKAGE_UCLIBC_NG_TEST=y" >> $(ADK_TOPDIR)/.defconfig; \
 		echo "ADK_PACKAGE_MAKE=y" >> $(ADK_TOPDIR)/.defconfig; \
-		echo "ADK_KERNEL_BLK_DEV_INITRD=y" >> $(ADK_TOPDIR)/.defconfig; \
-		echo "ADK_KERNEL_COMP_XZ=y" >> $(ADK_TOPDIR)/.defconfig; \
-		echo "ADK_KERNEL_INITRAMFS_COMPRESSION_XZ=y" >> $(ADK_TOPDIR)/.defconfig; \
 		echo "ADK_KERNEL_IPV6=y" >> $(ADK_TOPDIR)/.defconfig; \
 	fi
 	@if [ ! -z "$(ADK_UCLIBC_NATIVE)" ];then \
@@ -368,9 +362,6 @@ endif
 		echo "ADK_PACKAGE_BINUTILS=y" >> $(ADK_TOPDIR)/.defconfig; \
 		echo "ADK_PACKAGE_MAKE=y" >> $(ADK_TOPDIR)/.defconfig; \
 		echo "ADK_PACKAGE_UCLIBC_NG_DEV=y" >> $(ADK_TOPDIR)/.defconfig; \
-		echo "ADK_KERNEL_BLK_DEV_INITRD=y" >> $(ADK_TOPDIR)/.defconfig; \
-		echo "ADK_KERNEL_COMP_XZ=y" >> $(ADK_TOPDIR)/.defconfig; \
-		echo "ADK_KERNEL_INITRAMFS_COMPRESSION_XZ=y" >> $(ADK_TOPDIR)/.defconfig; \
 		echo "ADK_KERNEL_IPV6=y" >> $(ADK_TOPDIR)/.defconfig; \
 	fi
 	@if [ ! -z "$(ADK_TARGET_ARCH)" ];then \

+ 1 - 0
target/config/Config.in.target

@@ -190,6 +190,7 @@ config ADK_TARGET_ROOTFS_ISO
 config ADK_TARGET_ROOTFS_INITRAMFSARCHIVE
 	boolean "Archive usable for initramfs creation"
 	depends on !ADK_TARGET_SYSTEM_MIKROTIK_RB532
+	select ADK_KERNEL_BLK_DEV_INITRD
 	help
 	  Use this option if your planning to create a initramfs,
 	  useful for adk-test-framework.