diff options
| author | Peter Korsgaard <jacmet@sunsite.dk> | 2010-04-09 16:16:44 +0200 |
|---|---|---|
| committer | Peter Korsgaard <jacmet@sunsite.dk> | 2010-04-09 16:16:44 +0200 |
| commit | 6bb35a38c244b20bbd6e85fd16f69ff2c4f0ed72 (patch) | |
| tree | 432513fc67dcff844ecf5c48f38bdcf1a9fe3523 | |
| parent | b6ebab842dbb0581526f907bf5b39cad0ac1f756 (diff) | |
| parent | 0b79c5022d32b15180a18087a0fba5a2f1af5cc7 (diff) | |
| download | buildroot-novena-6bb35a38c244b20bbd6e85fd16f69ff2c4f0ed72.tar.gz buildroot-novena-6bb35a38c244b20bbd6e85fd16f69ff2c4f0ed72.zip | |
Merge branch 'fs-cleanup' of git://git.busybox.net/~tpetazzoni/git/buildroot
100 files changed, 963 insertions, 1675 deletions
@@ -346,4 +346,6 @@ source "toolchain/Config.in" source "package/Config.in" +source "fs/Config.in" + source "target/Config.in" @@ -323,6 +323,8 @@ ifeq ($(BR2_ENABLE_LOCALE_PURGE),y) TARGETS+=target-purgelocales endif +include fs/common.mk + # target stuff is last so it can override anything else include target/Makefile.in diff --git a/configs/at91rm9200df_defconfig b/configs/at91rm9200df_defconfig index 3d98b0f6b..1fe6e3f0d 100644 --- a/configs/at91rm9200df_defconfig +++ b/configs/at91rm9200df_defconfig @@ -353,7 +353,6 @@ BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-1.13.x.config" # BR2_PACKAGE_DISTCC is not set # BR2_PACKAGE_DMALLOC is not set # BR2_PACKAGE_FAKEROOT is not set -BR2_HOST_FAKEROOT=y BR2_PACKAGE_GETTEXT=y # BR2_PACKAGE_GETTEXT_STATIC is not set BR2_PACKAGE_LIBINTL=y @@ -854,12 +853,12 @@ BR2_TARGET_ROOTFS_EXT2_BLOCKS=0 BR2_TARGET_ROOTFS_EXT2_INODES=0 BR2_TARGET_ROOTFS_EXT2_RESBLKS=0 BR2_TARGET_ROOTFS_EXT2_SQUASH=y -BR2_TARGET_ROOTFS_EXT2_OUTPUT="$(IMAGE).ext2" + BR2_TARGET_ROOTFS_EXT2_NONE=y # BR2_TARGET_ROOTFS_EXT2_GZIP is not set # BR2_TARGET_ROOTFS_EXT2_BZIP2 is not set # BR2_TARGET_ROOTFS_EXT2_LZMA is not set -BR2_TARGET_ROOTFS_EXT2_COPYTO="/tftpboot" + BR2_TARGET_ROOTFS_JFFS2=y BR2_TARGET_ROOTFS_JFFS2_DATAFLASH_1056=y # BR2_TARGET_ROOTFS_JFFS2_DATAFLASH_528 is not set @@ -876,8 +875,8 @@ BR2_TARGET_ROOTFS_JFFS2_LE=y # BR2_TARGET_ROOTFS_JFFS2_BE is not set # BR2_TARGET_ROOTFS_JFFS2_SQUASH is not set # BR2_TARGET_ROOTFS_JFFS2_SUMMARY is not set -BR2_TARGET_ROOTFS_JFFS2_OUTPUT="$(IMAGE).jffs2" -BR2_TARGET_ROOTFS_JFFS2_COPYTO="/tftpboot" + + # BR2_TARGET_ROOTFS_UBIFS is not set # BR2_TARGET_ROOTFS_SQUASHFS is not set # BR2_TARGET_ROOTFS_TAR is not set diff --git a/configs/at91rm9200df_ext_defconfig b/configs/at91rm9200df_ext_defconfig index 1dea062c9..32843bafa 100644 --- a/configs/at91rm9200df_ext_defconfig +++ b/configs/at91rm9200df_ext_defconfig @@ -278,7 +278,6 @@ BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-1.13.x.config" # BR2_PACKAGE_DISTCC is not set # BR2_PACKAGE_DMALLOC is not set # BR2_PACKAGE_FAKEROOT is not set -BR2_HOST_FAKEROOT=y BR2_PACKAGE_GETTEXT=y # BR2_PACKAGE_GETTEXT_STATIC is not set BR2_PACKAGE_LIBINTL=y @@ -779,12 +778,12 @@ BR2_TARGET_ROOTFS_EXT2_BLOCKS=0 BR2_TARGET_ROOTFS_EXT2_INODES=0 BR2_TARGET_ROOTFS_EXT2_RESBLKS=0 BR2_TARGET_ROOTFS_EXT2_SQUASH=y -BR2_TARGET_ROOTFS_EXT2_OUTPUT="$(IMAGE).ext2" + BR2_TARGET_ROOTFS_EXT2_NONE=y # BR2_TARGET_ROOTFS_EXT2_GZIP is not set # BR2_TARGET_ROOTFS_EXT2_BZIP2 is not set # BR2_TARGET_ROOTFS_EXT2_LZMA is not set -BR2_TARGET_ROOTFS_EXT2_COPYTO="/tftpboot" + BR2_TARGET_ROOTFS_JFFS2=y BR2_TARGET_ROOTFS_JFFS2_DATAFLASH_1056=y # BR2_TARGET_ROOTFS_JFFS2_DATAFLASH_528 is not set @@ -801,8 +800,8 @@ BR2_TARGET_ROOTFS_JFFS2_LE=y # BR2_TARGET_ROOTFS_JFFS2_BE is not set # BR2_TARGET_ROOTFS_JFFS2_SQUASH is not set # BR2_TARGET_ROOTFS_JFFS2_SUMMARY is not set -BR2_TARGET_ROOTFS_JFFS2_OUTPUT="$(IMAGE).jffs2" -BR2_TARGET_ROOTFS_JFFS2_COPYTO="/tftpboot" + + # BR2_TARGET_ROOTFS_UBIFS is not set # BR2_TARGET_ROOTFS_SQUASHFS is not set # BR2_TARGET_ROOTFS_TAR is not set diff --git a/configs/at91sam9260dfc_defconfig b/configs/at91sam9260dfc_defconfig index 1b4094e42..46166e066 100644 --- a/configs/at91sam9260dfc_defconfig +++ b/configs/at91sam9260dfc_defconfig @@ -365,7 +365,6 @@ BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-1.13.x.config" # BR2_PACKAGE_DISTCC is not set # BR2_PACKAGE_DMALLOC is not set # BR2_PACKAGE_FAKEROOT is not set -BR2_HOST_FAKEROOT=y BR2_PACKAGE_GETTEXT=y # BR2_PACKAGE_GETTEXT_STATIC is not set BR2_PACKAGE_LIBINTL=y @@ -868,12 +867,12 @@ BR2_TARGET_ROOTFS_EXT2_BLOCKS=0 BR2_TARGET_ROOTFS_EXT2_INODES=0 BR2_TARGET_ROOTFS_EXT2_RESBLKS=0 BR2_TARGET_ROOTFS_EXT2_SQUASH=y -BR2_TARGET_ROOTFS_EXT2_OUTPUT="$(IMAGE).ext2" + BR2_TARGET_ROOTFS_EXT2_NONE=y # BR2_TARGET_ROOTFS_EXT2_GZIP is not set # BR2_TARGET_ROOTFS_EXT2_BZIP2 is not set # BR2_TARGET_ROOTFS_EXT2_LZMA is not set -BR2_TARGET_ROOTFS_EXT2_COPYTO="/tftpboot" + BR2_TARGET_ROOTFS_JFFS2=y BR2_TARGET_ROOTFS_JFFS2_DATAFLASH_1056=y # BR2_TARGET_ROOTFS_JFFS2_DATAFLASH_528 is not set @@ -890,8 +889,8 @@ BR2_TARGET_ROOTFS_JFFS2_LE=y # BR2_TARGET_ROOTFS_JFFS2_BE is not set # BR2_TARGET_ROOTFS_JFFS2_SQUASH is not set # BR2_TARGET_ROOTFS_JFFS2_SUMMARY is not set -BR2_TARGET_ROOTFS_JFFS2_OUTPUT="$(IMAGE).jffs2" -BR2_TARGET_ROOTFS_JFFS2_COPYTO="/tftpboot" + + # BR2_TARGET_ROOTFS_UBIFS is not set # BR2_TARGET_ROOTFS_SQUASHFS is not set # BR2_TARGET_ROOTFS_TAR is not set diff --git a/configs/at91sam9260dfc_ext_defconfig b/configs/at91sam9260dfc_ext_defconfig index 14bdc7aec..7f1288438 100644 --- a/configs/at91sam9260dfc_ext_defconfig +++ b/configs/at91sam9260dfc_ext_defconfig @@ -286,7 +286,6 @@ BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-1.13.x.config" # BR2_PACKAGE_DISTCC is not set # BR2_PACKAGE_DMALLOC is not set # BR2_PACKAGE_FAKEROOT is not set -BR2_HOST_FAKEROOT=y BR2_PACKAGE_GETTEXT=y # BR2_PACKAGE_GETTEXT_STATIC is not set BR2_PACKAGE_LIBINTL=y @@ -787,12 +786,12 @@ BR2_TARGET_ROOTFS_EXT2_BLOCKS=0 BR2_TARGET_ROOTFS_EXT2_INODES=0 BR2_TARGET_ROOTFS_EXT2_RESBLKS=0 BR2_TARGET_ROOTFS_EXT2_SQUASH=y -BR2_TARGET_ROOTFS_EXT2_OUTPUT="$(IMAGE).ext2" + BR2_TARGET_ROOTFS_EXT2_NONE=y # BR2_TARGET_ROOTFS_EXT2_GZIP is not set # BR2_TARGET_ROOTFS_EXT2_BZIP2 is not set # BR2_TARGET_ROOTFS_EXT2_LZMA is not set -BR2_TARGET_ROOTFS_EXT2_COPYTO="/tftpboot" + BR2_TARGET_ROOTFS_JFFS2=y BR2_TARGET_ROOTFS_JFFS2_DATAFLASH_1056=y # BR2_TARGET_ROOTFS_JFFS2_DATAFLASH_528 is not set @@ -809,8 +808,8 @@ BR2_TARGET_ROOTFS_JFFS2_LE=y # BR2_TARGET_ROOTFS_JFFS2_BE is not set # BR2_TARGET_ROOTFS_JFFS2_SQUASH is not set # BR2_TARGET_ROOTFS_JFFS2_SUMMARY is not set -BR2_TARGET_ROOTFS_JFFS2_OUTPUT="$(IMAGE).jffs2" -BR2_TARGET_ROOTFS_JFFS2_COPYTO="/tftpboot" + + # BR2_TARGET_ROOTFS_UBIFS is not set # BR2_TARGET_ROOTFS_SQUASHFS is not set # BR2_TARGET_ROOTFS_TAR is not set diff --git a/configs/at91sam9260pf_defconfig b/configs/at91sam9260pf_defconfig index de513a681..b9e8a28a6 100644 --- a/configs/at91sam9260pf_defconfig +++ b/configs/at91sam9260pf_defconfig @@ -275,7 +275,6 @@ BR2_PACKAGE_DISTCC=y BR2_PACKAGE_DMALLOC=y BR2_PACKAGE_EXPAT=y # BR2_PACKAGE_FAKEROOT is not set -BR2_HOST_FAKEROOT=y BR2_PACKAGE_GETTEXT=y # BR2_PACKAGE_GETTEXT_STATIC is not set BR2_PACKAGE_LIBINTL=y @@ -559,12 +558,12 @@ BR2_TARGET_ROOTFS_EXT2_BLOCKS=0 BR2_TARGET_ROOTFS_EXT2_INODES=0 BR2_TARGET_ROOTFS_EXT2_RESBLKS=0 BR2_TARGET_ROOTFS_EXT2_SQUASH=y -BR2_TARGET_ROOTFS_EXT2_OUTPUT="$(IMAGE).ext2" + BR2_TARGET_ROOTFS_EXT2_NONE=y # BR2_TARGET_ROOTFS_EXT2_GZIP is not set # BR2_TARGET_ROOTFS_EXT2_BZIP2 is not set # BR2_TARGET_ROOTFS_EXT2_LZMA is not set -BR2_TARGET_ROOTFS_EXT2_COPYTO="" + # BR2_TARGET_ROOTFS_JFFS2 is not set # BR2_TARGET_ROOTFS_SQUASHFS is not set # BR2_TARGET_ROOTFS_TAR is not set diff --git a/configs/at91sam9261ek_defconfig b/configs/at91sam9261ek_defconfig index 9598085b9..1073e78d2 100644 --- a/configs/at91sam9261ek_defconfig +++ b/configs/at91sam9261ek_defconfig @@ -359,7 +359,6 @@ BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-1.13.x.config" # BR2_PACKAGE_DISTCC is not set # BR2_PACKAGE_DMALLOC is not set # BR2_PACKAGE_FAKEROOT is not set -BR2_HOST_FAKEROOT=y BR2_PACKAGE_GETTEXT=y # BR2_PACKAGE_GETTEXT_STATIC is not set BR2_PACKAGE_LIBINTL=y @@ -919,12 +918,12 @@ BR2_TARGET_ROOTFS_EXT2_BLOCKS=0 BR2_TARGET_ROOTFS_EXT2_INODES=0 BR2_TARGET_ROOTFS_EXT2_RESBLKS=0 BR2_TARGET_ROOTFS_EXT2_SQUASH=y -BR2_TARGET_ROOTFS_EXT2_OUTPUT="$(IMAGE).ext2" + BR2_TARGET_ROOTFS_EXT2_NONE=y # BR2_TARGET_ROOTFS_EXT2_GZIP is not set # BR2_TARGET_ROOTFS_EXT2_BZIP2 is not set # BR2_TARGET_ROOTFS_EXT2_LZMA is not set -BR2_TARGET_ROOTFS_EXT2_COPYTO="" + BR2_TARGET_ROOTFS_JFFS2=y # BR2_TARGET_ROOTFS_JFFS2_DATAFLASH_1056 is not set # BR2_TARGET_ROOTFS_JFFS2_DATAFLASH_528 is not set @@ -942,8 +941,8 @@ BR2_TARGET_ROOTFS_JFFS2_LE=y # BR2_TARGET_ROOTFS_JFFS2_BE is not set # BR2_TARGET_ROOTFS_JFFS2_SQUASH is not set # BR2_TARGET_ROOTFS_JFFS2_SUMMARY is not set -BR2_TARGET_ROOTFS_JFFS2_OUTPUT="$(IMAGE).jffs2" -BR2_TARGET_ROOTFS_JFFS2_COPYTO="" + + # BR2_TARGET_ROOTFS_UBIFS is not set # BR2_TARGET_ROOTFS_SQUASHFS is not set # BR2_TARGET_ROOTFS_TAR is not set diff --git a/configs/at91sam9261ek_ext_defconfig b/configs/at91sam9261ek_ext_defconfig index e7da95ad8..d7f9f4ad4 100644 --- a/configs/at91sam9261ek_ext_defconfig +++ b/configs/at91sam9261ek_ext_defconfig @@ -317,7 +317,6 @@ BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-1.13.x.config" # BR2_PACKAGE_DISTCC is not set # BR2_PACKAGE_DMALLOC is not set # BR2_PACKAGE_FAKEROOT is not set -BR2_HOST_FAKEROOT=y BR2_PACKAGE_GETTEXT=y # BR2_PACKAGE_GETTEXT_STATIC is not set BR2_PACKAGE_LIBINTL=y @@ -875,12 +874,12 @@ BR2_TARGET_ROOTFS_EXT2_BLOCKS=0 BR2_TARGET_ROOTFS_EXT2_INODES=0 BR2_TARGET_ROOTFS_EXT2_RESBLKS=0 BR2_TARGET_ROOTFS_EXT2_SQUASH=y -BR2_TARGET_ROOTFS_EXT2_OUTPUT="$(IMAGE).ext2" + BR2_TARGET_ROOTFS_EXT2_NONE=y # BR2_TARGET_ROOTFS_EXT2_GZIP is not set # BR2_TARGET_ROOTFS_EXT2_BZIP2 is not set # BR2_TARGET_ROOTFS_EXT2_LZMA is not set -BR2_TARGET_ROOTFS_EXT2_COPYTO="" + BR2_TARGET_ROOTFS_JFFS2=y # BR2_TARGET_ROOTFS_JFFS2_DATAFLASH_1056 is not set # BR2_TARGET_ROOTFS_JFFS2_DATAFLASH_528 is not set @@ -898,8 +897,8 @@ BR2_TARGET_ROOTFS_JFFS2_LE=y # BR2_TARGET_ROOTFS_JFFS2_BE is not set # BR2_TARGET_ROOTFS_JFFS2_SQUASH is not set # BR2_TARGET_ROOTFS_JFFS2_SUMMARY is not set -BR2_TARGET_ROOTFS_JFFS2_OUTPUT="$(IMAGE).jffs2" -BR2_TARGET_ROOTFS_JFFS2_COPYTO="" + + # BR2_TARGET_ROOTFS_UBIFS is not set # BR2_TARGET_ROOTFS_SQUASHFS is not set # BR2_TARGET_ROOTFS_TAR is not set diff --git a/configs/at91sam9263ek_defconfig b/configs/at91sam9263ek_defconfig index 145700da6..74dbfcdbb 100644 --- a/configs/at91sam9263ek_defconfig +++ b/configs/at91sam9263ek_defconfig @@ -358,7 +358,6 @@ BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-1.13.x.config" # BR2_PACKAGE_DISTCC is not set # BR2_PACKAGE_DMALLOC is not set # BR2_PACKAGE_FAKEROOT is not set -BR2_HOST_FAKEROOT=y BR2_PACKAGE_GETTEXT=y # BR2_PACKAGE_GETTEXT_STATIC is not set BR2_PACKAGE_LIBINTL=y @@ -916,12 +915,12 @@ BR2_TARGET_ROOTFS_EXT2_BLOCKS=0 BR2_TARGET_ROOTFS_EXT2_INODES=0 BR2_TARGET_ROOTFS_EXT2_RESBLKS=0 BR2_TARGET_ROOTFS_EXT2_SQUASH=y -BR2_TARGET_ROOTFS_EXT2_OUTPUT="$(IMAGE).ext2" + BR2_TARGET_ROOTFS_EXT2_NONE=y # BR2_TARGET_ROOTFS_EXT2_GZIP is not set # BR2_TARGET_ROOTFS_EXT2_BZIP2 is not set # BR2_TARGET_ROOTFS_EXT2_LZMA is not set -BR2_TARGET_ROOTFS_EXT2_COPYTO="" + BR2_TARGET_ROOTFS_JFFS2=y # BR2_TARGET_ROOTFS_JFFS2_DATAFLASH_1056 is not set # BR2_TARGET_ROOTFS_JFFS2_DATAFLASH_528 is not set @@ -939,8 +938,8 @@ BR2_TARGET_ROOTFS_JFFS2_LE=y # BR2_TARGET_ROOTFS_JFFS2_BE is not set # BR2_TARGET_ROOTFS_JFFS2_SQUASH is not set # BR2_TARGET_ROOTFS_JFFS2_SUMMARY is not set -BR2_TARGET_ROOTFS_JFFS2_OUTPUT="$(IMAGE).jffs2" -BR2_TARGET_ROOTFS_JFFS2_COPYTO="" + + # BR2_TARGET_ROOTFS_UBIFS is not set # BR2_TARGET_ROOTFS_SQUASHFS is not set # BR2_TARGET_ROOTFS_TAR is not set diff --git a/configs/at91sam9263ek_ext_defconfig b/configs/at91sam9263ek_ext_defconfig index 15b4d3b17..44c30e22e 100644 --- a/configs/at91sam9263ek_ext_defconfig +++ b/configs/at91sam9263ek_ext_defconfig @@ -279,7 +279,6 @@ BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-1.13.x.config" # BR2_PACKAGE_DISTCC is not set # BR2_PACKAGE_DMALLOC is not set # BR2_PACKAGE_FAKEROOT is not set -BR2_HOST_FAKEROOT=y BR2_PACKAGE_GETTEXT=y # BR2_PACKAGE_GETTEXT_STATIC is not set BR2_PACKAGE_LIBINTL=y @@ -837,12 +836,12 @@ BR2_TARGET_ROOTFS_EXT2_BLOCKS=0 BR2_TARGET_ROOTFS_EXT2_INODES=0 BR2_TARGET_ROOTFS_EXT2_RESBLKS=0 BR2_TARGET_ROOTFS_EXT2_SQUASH=y -BR2_TARGET_ROOTFS_EXT2_OUTPUT="$(IMAGE).ext2" + BR2_TARGET_ROOTFS_EXT2_NONE=y # BR2_TARGET_ROOTFS_EXT2_GZIP is not set # BR2_TARGET_ROOTFS_EXT2_BZIP2 is not set # BR2_TARGET_ROOTFS_EXT2_LZMA is not set -BR2_TARGET_ROOTFS_EXT2_COPYTO="" + BR2_TARGET_ROOTFS_JFFS2=y # BR2_TARGET_ROOTFS_JFFS2_DATAFLASH_1056 is not set # BR2_TARGET_ROOTFS_JFFS2_DATAFLASH_528 is not set @@ -860,8 +859,8 @@ BR2_TARGET_ROOTFS_JFFS2_LE=y # BR2_TARGET_ROOTFS_JFFS2_BE is not set # BR2_TARGET_ROOTFS_JFFS2_SQUASH is not set # BR2_TARGET_ROOTFS_JFFS2_SUMMARY is not set -BR2_TARGET_ROOTFS_JFFS2_OUTPUT="$(IMAGE).jffs2" -BR2_TARGET_ROOTFS_JFFS2_COPYTO="" + + # BR2_TARGET_ROOTFS_UBIFS is not set # BR2_TARGET_ROOTFS_SQUASHFS is not set # BR2_TARGET_ROOTFS_TAR is not set diff --git a/configs/at91sam9g20dfc_defconfig b/configs/at91sam9g20dfc_defconfig index a6ef10c95..9b3af7692 100644 --- a/configs/at91sam9g20dfc_defconfig +++ b/configs/at91sam9g20dfc_defconfig @@ -358,7 +358,6 @@ BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-1.13.x.config" # BR2_PACKAGE_DISTCC is not set # BR2_PACKAGE_DMALLOC is not set # BR2_PACKAGE_FAKEROOT is not set -BR2_HOST_FAKEROOT=y BR2_PACKAGE_GETTEXT=y # BR2_PACKAGE_GETTEXT_STATIC is not set BR2_PACKAGE_LIBINTL=y @@ -784,12 +783,12 @@ BR2_TARGET_ROOTFS_EXT2_BLOCKS=0 BR2_TARGET_ROOTFS_EXT2_INODES=0 BR2_TARGET_ROOTFS_EXT2_RESBLKS=0 BR2_TARGET_ROOTFS_EXT2_SQUASH=y -BR2_TARGET_ROOTFS_EXT2_OUTPUT="$(IMAGE).ext2" + BR2_TARGET_ROOTFS_EXT2_NONE=y # BR2_TARGET_ROOTFS_EXT2_GZIP is not set # BR2_TARGET_ROOTFS_EXT2_BZIP2 is not set # BR2_TARGET_ROOTFS_EXT2_LZMA is not set -BR2_TARGET_ROOTFS_EXT2_COPYTO="/tftpboot" + BR2_TARGET_ROOTFS_JFFS2=y BR2_TARGET_ROOTFS_JFFS2_DATAFLASH_1056=y # BR2_TARGET_ROOTFS_JFFS2_DATAFLASH_528 is not set @@ -806,8 +805,8 @@ BR2_TARGET_ROOTFS_JFFS2_LE=y # BR2_TARGET_ROOTFS_JFFS2_BE is not set # BR2_TARGET_ROOTFS_JFFS2_SQUASH is not set # BR2_TARGET_ROOTFS_JFFS2_SUMMARY is not set -BR2_TARGET_ROOTFS_JFFS2_OUTPUT="$(IMAGE).jffs2" -BR2_TARGET_ROOTFS_JFFS2_COPYTO="/tftpboot" + + # BR2_TARGET_ROOTFS_UBIFS is not set # BR2_TARGET_ROOTFS_SQUASHFS is not set # BR2_TARGET_ROOTFS_TAR is not set diff --git a/configs/at91sam9g20dfc_ext_defconfig b/configs/at91sam9g20dfc_ext_defconfig index 96d979348..5bf6ea7d0 100644 --- a/configs/at91sam9g20dfc_ext_defconfig +++ b/configs/at91sam9g20dfc_ext_defconfig @@ -286,7 +286,6 @@ BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-1.13.x.config" # BR2_PACKAGE_DISTCC is not set # BR2_PACKAGE_DMALLOC is not set # BR2_PACKAGE_FAKEROOT is not set -BR2_HOST_FAKEROOT=y BR2_PACKAGE_GETTEXT=y # BR2_PACKAGE_GETTEXT_STATIC is not set BR2_PACKAGE_LIBINTL=y @@ -787,12 +786,12 @@ BR2_TARGET_ROOTFS_EXT2_BLOCKS=0 BR2_TARGET_ROOTFS_EXT2_INODES=0 BR2_TARGET_ROOTFS_EXT2_RESBLKS=0 BR2_TARGET_ROOTFS_EXT2_SQUASH=y -BR2_TARGET_ROOTFS_EXT2_OUTPUT="$(IMAGE).ext2" + BR2_TARGET_ROOTFS_EXT2_NONE=y # BR2_TARGET_ROOTFS_EXT2_GZIP is not set # BR2_TARGET_ROOTFS_EXT2_BZIP2 is not set # BR2_TARGET_ROOTFS_EXT2_LZMA is not set -BR2_TARGET_ROOTFS_EXT2_COPYTO="/tftpboot" + BR2_TARGET_ROOTFS_JFFS2=y BR2_TARGET_ROOTFS_JFFS2_DATAFLASH_1056=y # BR2_TARGET_ROOTFS_JFFS2_DATAFLASH_528 is not set @@ -809,8 +808,8 @@ BR2_TARGET_ROOTFS_JFFS2_LE=y # BR2_TARGET_ROOTFS_JFFS2_BE is not set # BR2_TARGET_ROOTFS_JFFS2_SQUASH is not set # BR2_TARGET_ROOTFS_JFFS2_SUMMARY is not set -BR2_TARGET_ROOTFS_JFFS2_OUTPUT="$(IMAGE).jffs2" -BR2_TARGET_ROOTFS_JFFS2_COPYTO="/tftpboot" + + # BR2_TARGET_ROOTFS_UBIFS is not set # BR2_TARGET_ROOTFS_SQUASHFS is not set # BR2_TARGET_ROOTFS_TAR is not set diff --git a/configs/atngw100-base_defconfig b/configs/atngw100-base_defconfig index 6fbc0deb9..fe3498936 100644 --- a/configs/atngw100-base_defconfig +++ b/configs/atngw100-base_defconfig @@ -275,7 +275,6 @@ BR2_PACKAGE_BUSYBOX_SKELETON=y # BR2_PACKAGE_DISTCC is not set # BR2_PACKAGE_DMALLOC is not set # BR2_PACKAGE_FAKEROOT is not set -BR2_HOST_FAKEROOT=y # BR2_PACKAGE_GETTEXT is not set # BR2_PACKAGE_LIBINTL is not set # BR2_PACKAGE_LIBGMP is not set @@ -724,8 +723,8 @@ BR2_TARGET_ROOTFS_JFFS2_PADSIZE=0x0 # BR2_TARGET_ROOTFS_JFFS2_LE is not set BR2_TARGET_ROOTFS_JFFS2_BE=y # BR2_TARGET_ROOTFS_JFFS2_SUMMARY is not set -BR2_TARGET_ROOTFS_JFFS2_OUTPUT="$(IMAGE).jffs2" -BR2_TARGET_ROOTFS_JFFS2_COPYTO="" + + # BR2_TARGET_ROOTFS_UBIFS is not set # BR2_TARGET_ROOTFS_SQUASHFS is not set BR2_TARGET_ROOTFS_TAR=y @@ -734,7 +733,7 @@ BR2_TARGET_ROOTFS_TAR_NONE=y # BR2_TARGET_ROOTFS_TAR_BZIP2 is not set # BR2_TARGET_ROOTFS_TAR_LZMA is not set BR2_TARGET_ROOTFS_TAR_OPTIONS="" -BR2_TARGET_ROOTFS_TAR_COPYTO="" + # BR2_TARGET_ROOTFS_CPIO is not set # BR2_TARGET_ROOTFS_INITRAMFS is not set # BR2_TARGET_ROOTFS_ROMFS is not set diff --git a/configs/atngw100_defconfig b/configs/atngw100_defconfig index 7a6cba41b..4a702a593 100644 --- a/configs/atngw100_defconfig +++ b/configs/atngw100_defconfig @@ -286,7 +286,6 @@ BR2_PACKAGE_BUSYBOX_SKELETON=y # BR2_PACKAGE_DISTCC is not set # BR2_PACKAGE_DMALLOC is not set # BR2_PACKAGE_FAKEROOT is not set -BR2_HOST_FAKEROOT=y BR2_PACKAGE_GETTEXT=y BR2_PACKAGE_LIBINTL=y # BR2_PACKAGE_LIBGMP is not set @@ -714,8 +713,8 @@ BR2_TARGET_ROOTFS_JFFS2_NOCLEANMARKER=y # BR2_TARGET_ROOTFS_JFFS2_LE is not set BR2_TARGET_ROOTFS_JFFS2_BE=y # BR2_TARGET_ROOTFS_JFFS2_SUMMARY is not set -BR2_TARGET_ROOTFS_JFFS2_OUTPUT="$(IMAGE).jffs2" -BR2_TARGET_ROOTFS_JFFS2_COPYTO="/tftpboot" + + # BR2_TARGET_ROOTFS_UBIFS is not set # BR2_TARGET_ROOTFS_SQUASHFS is not set BR2_TARGET_ROOTFS_TAR=y @@ -724,7 +723,7 @@ BR2_TARGET_ROOTFS_TAR_NONE=y # BR2_TARGET_ROOTFS_TAR_BZIP2 is not set # BR2_TARGET_ROOTFS_TAR_LZMA is not set BR2_TARGET_ROOTFS_TAR_OPTIONS="" -BR2_TARGET_ROOTFS_TAR_COPYTO="" + # BR2_TARGET_ROOTFS_CPIO is not set # BR2_TARGET_ROOTFS_INITRAMFS is not set # BR2_TARGET_ROOTFS_ROMFS is not set diff --git a/configs/atstk1005_defconfig b/configs/atstk1005_defconfig index 309ac0828..c829495a8 100644 --- a/configs/atstk1005_defconfig +++ b/configs/atstk1005_defconfig @@ -297,7 +297,6 @@ BR2_PACKAGE_BUSYBOX_SKELETON=y # BR2_PACKAGE_DISTCC is not set # BR2_PACKAGE_DMALLOC is not set # BR2_PACKAGE_FAKEROOT is not set -BR2_HOST_FAKEROOT=y BR2_PACKAGE_GETTEXT=y BR2_PACKAGE_LIBINTL=y # BR2_PACKAGE_LIBGMP is not set @@ -758,8 +757,8 @@ BR2_TARGET_ROOTFS_JFFS2_NOCLEANMARKER=y BR2_TARGET_ROOTFS_JFFS2_BE=y # BR2_TARGET_ROOTFS_JFFS2_SQUASH is not set # BR2_TARGET_ROOTFS_JFFS2_SUMMARY is not set -BR2_TARGET_ROOTFS_JFFS2_OUTPUT="$(IMAGE).jffs2" -BR2_TARGET_ROOTFS_JFFS2_COPYTO="/tftpboot" + + # BR2_TARGET_ROOTFS_UBIFS is not set # BR2_TARGET_ROOTFS_SQUASHFS is not set BR2_TARGET_ROOTFS_TAR=y @@ -768,7 +767,7 @@ BR2_TARGET_ROOTFS_TAR_NONE=y # BR2_TARGET_ROOTFS_TAR_BZIP2 is not set # BR2_TARGET_ROOTFS_TAR_LZMA is not set BR2_TARGET_ROOTFS_TAR_OPTIONS="" -BR2_TARGET_ROOTFS_TAR_COPYTO="" + # BR2_TARGET_ROOTFS_CPIO is not set # BR2_TARGET_ROOTFS_INITRAMFS is not set # BR2_TARGET_ROOTFS_ROMFS is not set diff --git a/configs/atstk100x_defconfig b/configs/atstk100x_defconfig index b4abff9fe..c1398d4eb 100644 --- a/configs/atstk100x_defconfig +++ b/configs/atstk100x_defconfig @@ -297,7 +297,6 @@ BR2_PACKAGE_BZIP2=y # BR2_PACKAGE_DISTCC is not set # BR2_PACKAGE_DMALLOC is not set # BR2_PACKAGE_FAKEROOT is not set -BR2_HOST_FAKEROOT=y BR2_PACKAGE_GETTEXT=y BR2_PACKAGE_LIBINTL=y # BR2_PACKAGE_LIBGMP is not set @@ -849,12 +848,12 @@ BR2_TARGET_ROOTFS_EXT2_BLOCKS=0 BR2_TARGET_ROOTFS_EXT2_INODES=0 BR2_TARGET_ROOTFS_EXT2_RESBLKS=0 BR2_TARGET_ROOTFS_EXT2_SQUASH=y -BR2_TARGET_ROOTFS_EXT2_OUTPUT="$(IMAGE).ext2" + # BR2_TARGET_ROOTFS_EXT2_NONE is not set # BR2_TARGET_ROOTFS_EXT2_GZIP is not set BR2_TARGET_ROOTFS_EXT2_BZIP2=y # BR2_TARGET_ROOTFS_EXT2_LZMA is not set -BR2_TARGET_ROOTFS_EXT2_COPYTO="/tftpboot" + # BR2_TARGET_ROOTFS_JFFS2 is not set # BR2_TARGET_ROOTFS_UBIFS is not set # BR2_TARGET_ROOTFS_SQUASHFS is not set @@ -864,7 +863,7 @@ BR2_TARGET_ROOTFS_TAR_NONE=y # BR2_TARGET_ROOTFS_TAR_BZIP2 is not set # BR2_TARGET_ROOTFS_TAR_LZMA is not set BR2_TARGET_ROOTFS_TAR_OPTIONS="" -BR2_TARGET_ROOTFS_TAR_COPYTO="" + # BR2_TARGET_ROOTFS_CPIO is not set # BR2_TARGET_ROOTFS_INITRAMFS is not set # BR2_TARGET_ROOTFS_ROMFS is not set diff --git a/configs/i386_defconfig b/configs/i386_defconfig index 97067c486..4c2d092cd 100644 --- a/configs/i386_defconfig +++ b/configs/i386_defconfig @@ -285,7 +285,6 @@ BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-1.13.x.config" # BR2_PACKAGE_DISTCC is not set # BR2_PACKAGE_DMALLOC is not set # BR2_PACKAGE_FAKEROOT is not set -BR2_HOST_FAKEROOT=y # BR2_PACKAGE_GETTEXT is not set # BR2_PACKAGE_LIBINTL is not set # BR2_PACKAGE_LIBGMP is not set @@ -702,8 +701,8 @@ BR2_TARGET_ROOTFS_JFFS2_EBSIZE=0x20000 BR2_TARGET_ROOTFS_JFFS2_LE=y # BR2_TARGET_ROOTFS_JFFS2_BE is not set # BR2_TARGET_ROOTFS_JFFS2_SUMMARY is not set -BR2_TARGET_ROOTFS_JFFS2_OUTPUT="$(IMAGE).jffs2" -BR2_TARGET_ROOTFS_JFFS2_COPYTO="" + + # BR2_TARGET_ROOTFS_UBIFS is not set # BR2_TARGET_ROOTFS_SQUASHFS is not set # BR2_TARGET_ROOTFS_TAR is not set diff --git a/configs/i686_defconfig b/configs/i686_defconfig index a3a26839a..dcf35d764 100644 --- a/configs/i686_defconfig +++ b/configs/i686_defconfig @@ -285,7 +285,6 @@ BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-1.13.x.config" # BR2_PACKAGE_DISTCC is not set # BR2_PACKAGE_DMALLOC is not set # BR2_PACKAGE_FAKEROOT is not set -BR2_HOST_FAKEROOT=y # BR2_PACKAGE_GETTEXT is not set # BR2_PACKAGE_LIBINTL is not set # BR2_PACKAGE_LIBGMP is not set @@ -702,8 +701,8 @@ BR2_TARGET_ROOTFS_JFFS2_EBSIZE=0x20000 BR2_TARGET_ROOTFS_JFFS2_LE=y # BR2_TARGET_ROOTFS_JFFS2_BE is not set # BR2_TARGET_ROOTFS_JFFS2_SUMMARY is not set -BR2_TARGET_ROOTFS_JFFS2_OUTPUT="$(IMAGE).jffs2" -BR2_TARGET_ROOTFS_JFFS2_COPYTO="" + + # BR2_TARGET_ROOTFS_UBIFS is not set # BR2_TARGET_ROOTFS_SQUASHFS is not set # BR2_TARGET_ROOTFS_TAR is not set diff --git a/configs/integrator926_defconfig b/configs/integrator926_defconfig index 63bc68dae..e537b4094 100644 --- a/configs/integrator926_defconfig +++ b/configs/integrator926_defconfig @@ -282,7 +282,6 @@ BR2_PACKAGE_BUSYBOX_SKELETON=y # BR2_PACKAGE_DISTCC is not set # BR2_PACKAGE_DMALLOC is not set # BR2_PACKAGE_FAKEROOT is not set -BR2_HOST_FAKEROOT=y # BR2_PACKAGE_GETTEXT is not set # BR2_PACKAGE_LIBINTL is not set # BR2_PACKAGE_LIBGMP is not set @@ -688,12 +687,12 @@ BR2_TARGET_ROOTFS_EXT2_BLOCKS=0 BR2_TARGET_ROOTFS_EXT2_INODES=0 BR2_TARGET_ROOTFS_EXT2_RESBLKS=0 BR2_TARGET_ROOTFS_EXT2_SQUASH=y -BR2_TARGET_ROOTFS_EXT2_OUTPUT="$(IMAGE).ext2" + BR2_TARGET_ROOTFS_EXT2_NONE=y # BR2_TARGET_ROOTFS_EXT2_GZIP is not set # BR2_TARGET_ROOTFS_EXT2_BZIP2 is not set # BR2_TARGET_ROOTFS_EXT2_LZMA is not set -BR2_TARGET_ROOTFS_EXT2_COPYTO="" + # BR2_TARGET_ROOTFS_JFFS2 is not set # BR2_TARGET_ROOTFS_UBIFS is not set # BR2_TARGET_ROOTFS_SQUASHFS is not set @@ -703,7 +702,7 @@ BR2_TARGET_ROOTFS_TAR_NONE=y # BR2_TARGET_ROOTFS_TAR_BZIP2 is not set # BR2_TARGET_ROOTFS_TAR_LZMA is not set BR2_TARGET_ROOTFS_TAR_OPTIONS="" -BR2_TARGET_ROOTFS_TAR_COPYTO="" + # BR2_TARGET_ROOTFS_CPIO is not set # BR2_TARGET_ROOTFS_INITRAMFS is not set # BR2_TARGET_ROOTFS_ROMFS is not set diff --git a/configs/integrator926_huge_defconfig b/configs/integrator926_huge_defconfig index 357e14331..276d69a41 100644 --- a/configs/integrator926_huge_defconfig +++ b/configs/integrator926_huge_defconfig @@ -286,7 +286,6 @@ BR2_PACKAGE_BISON=y # BR2_PACKAGE_DISTCC is not set # BR2_PACKAGE_DMALLOC is not set # BR2_PACKAGE_FAKEROOT is not set -BR2_HOST_FAKEROOT=y BR2_PACKAGE_GETTEXT=y # BR2_PACKAGE_GETTEXT_STATIC is not set BR2_PACKAGE_LIBINTL=y @@ -665,12 +664,12 @@ BR2_TARGET_ROOTFS_EXT2_BLOCKS=0 BR2_TARGET_ROOTFS_EXT2_INODES=0 BR2_TARGET_ROOTFS_EXT2_RESBLKS=0 BR2_TARGET_ROOTFS_EXT2_SQUASH=y -BR2_TARGET_ROOTFS_EXT2_OUTPUT="$(IMAGE).ext2" + BR2_TARGET_ROOTFS_EXT2_NONE=y # BR2_TARGET_ROOTFS_EXT2_GZIP is not set # BR2_TARGET_ROOTFS_EXT2_BZIP2 is not set # BR2_TARGET_ROOTFS_EXT2_LZMA is not set -BR2_TARGET_ROOTFS_EXT2_COPYTO="" + # BR2_TARGET_ROOTFS_JFFS2 is not set # BR2_TARGET_ROOTFS_UBIFS is not set # BR2_TARGET_ROOTFS_SQUASHFS is not set @@ -680,7 +679,7 @@ BR2_TARGET_ROOTFS_CPIO_NONE=y # BR2_TARGET_ROOTFS_CPIO_GZIP is not set # BR2_TARGET_ROOTFS_CPIO_BZIP2 is not set # BR2_TARGET_ROOTFS_CPIO_LZMA is not set -BR2_TARGET_ROOTFS_CPIO_COPYTO="" + # BR2_TARGET_ROOTFS_INITRAMFS is not set # BR2_TARGET_ROOTFS_ROMFS is not set diff --git a/configs/kb9202_defconfig b/configs/kb9202_defconfig index 608eb8695..67e6d6840 100644 --- a/configs/kb9202_defconfig +++ b/configs/kb9202_defconfig @@ -286,7 +286,6 @@ BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y # BR2_PACKAGE_DISTCC is not set # BR2_PACKAGE_DMALLOC is not set # BR2_PACKAGE_FAKEROOT is not set -BR2_HOST_FAKEROOT=y # BR2_PACKAGE_GETTEXT is not set # BR2_PACKAGE_LIBINTL is not set # BR2_PACKAGE_LIBGMP is not set @@ -673,7 +672,7 @@ BR2_TARGET_ROOTFS_TAR_NONE=y # BR2_TARGET_ROOTFS_TAR_BZIP2 is not set # BR2_TARGET_ROOTFS_TAR_LZMA is not set BR2_TARGET_ROOTFS_TAR_OPTIONS="" -BR2_TARGET_ROOTFS_TAR_COPYTO="" + # BR2_TARGET_ROOTFS_CPIO is not set # BR2_TARGET_ROOTFS_INITRAMFS is not set # BR2_TARGET_ROOTFS_ROMFS is not set diff --git a/configs/v100sc2_defconfig b/configs/v100sc2_defconfig index 336953ebf..836321aa2 100644 --- a/configs/v100sc2_defconfig +++ b/configs/v100sc2_defconfig @@ -267,7 +267,6 @@ BR2_PACKAGE_BASH=y # BR2_PACKAGE_DISTCC is not set # BR2_PACKAGE_DMALLOC is not set # BR2_PACKAGE_FAKEROOT is not set -BR2_HOST_FAKEROOT=y BR2_PACKAGE_GETTEXT=y BR2_PACKAGE_LIBINTL=y # BR2_PACKAGE_LIBGMP is not set @@ -704,7 +703,7 @@ BR2_TARGET_ROOTFS_TAR_NONE=y # BR2_TARGET_ROOTFS_TAR_BZIP2 is not set # BR2_TARGET_ROOTFS_TAR_LZMA is not set BR2_TARGET_ROOTFS_TAR_OPTIONS="" -BR2_TARGET_ROOTFS_TAR_COPYTO="" + # BR2_TARGET_ROOTFS_CPIO is not set # BR2_TARGET_ROOTFS_INITRAMFS is not set # BR2_TARGET_ROOTFS_ROMFS is not set diff --git a/fs/Config.in b/fs/Config.in new file mode 100644 index 000000000..f885c52e7 --- /dev/null +++ b/fs/Config.in @@ -0,0 +1,30 @@ +menu "Target filesystem options" + +config BR2_ROOTFS_POST_BUILD_SCRIPT + string "Custom script to run before packing files" + default "" + help + Specify a script to be run after the build has finished and before + the BR2 starts packing the files into selected packages. + + This gives users the oportunity to do board-specific cleanups, + add-ons and the like, so the generated files can be used directly + without further processing. + + The script is called with the target directory name as first and + only argument. Make sure the exit code of that script is 0, + otherwise make will stop after calling it. + +source "fs/cramfs/Config.in" +source "fs/cloop/Config.in" +source "fs/ext2/Config.in" +source "fs/jffs2/Config.in" +source "fs/ubifs/Config.in" +source "fs/squashfs/Config.in" +source "fs/tar/Config.in" +source "fs/cpio/Config.in" +source "fs/iso9660/Config.in" +source "fs/initramfs/Config.in" +source "fs/romfs/Config.in" + +endmenu diff --git a/target/cloop/Config.in b/fs/cloop/Config.in index 3e01067a1..3e01067a1 100644 --- a/target/cloop/Config.in +++ b/fs/cloop/Config.in diff --git a/fs/cloop/cloop.mk b/fs/cloop/cloop.mk new file mode 100644 index 000000000..c1d6abb80 --- /dev/null +++ b/fs/cloop/cloop.mk @@ -0,0 +1,13 @@ +############################################################# +# +# Build the compressed loop root filesystem image +# +############################################################# + +ROOTFS_CLOOP_DEPENDENCIES = host-cloop host-cdrkit + +define ROOTFS_CLOOP_CMD + $(HOST_DIR)/usr/bin/genisoimage -r $(TARGET_DIR) | $(HOST_DIR)/usr/bin/create_compressed_fs - 65536 > $$@ +endef + +$(eval $(call ROOTFS_TARGET,cloop))
\ No newline at end of file diff --git a/fs/common.mk b/fs/common.mk new file mode 100644 index 000000000..fa6afd94d --- /dev/null +++ b/fs/common.mk @@ -0,0 +1,70 @@ +# +# Macro that builds the needed Makefile target to create a root +# filesystem image. +# +# The following variable must be defined before calling this macro +# +# ROOTFS_$(FSTYPE)_CMD, the command that generates the root +# filesystem image. A single command is allowed. The filename of the +# filesystem image that it must generate is $$@. +# +# The following variables can optionaly be defined +# +# ROOTFS_$(FSTYPE)_DEPENDENCIES, the list of dependencies needed to +# build the root filesystem (usually host tools) +# +# ROOTFS_$(FSTYPE)_PRE_GEN_HOOKS, a list of hooks to call before +# generating the filesystem image +# +# ROOTFS_$(FSTYPE)_POST_GEN_HOOKS, a list of hooks to call after +# generating the filesystem image +# +# In terms of configuration option, this macro assumes that the +# BR2_TARGET_ROOTFS_$(FSTYPE) config option allows to enable/disable +# the generation of a filesystem image of a particular type. If +# configura options BR2_TARGET_ROOTFS_$(FSTYPE)_GZIP, +# BR2_TARGET_ROOTFS_$(FSTYPE)_BZIP2 or +# BR2_TARGET_ROOTFS_$(FSTYPE)_LZMA exist and are enabled, then the +# macro will automatically generate a compressed filesystem image. + +FAKEROOT_SCRIPT = $(BUILD_DIR)/_fakeroot.fs + +define ROOTFS_TARGET_INTERNAL + +$(BINARIES_DIR)/rootfs.$(1): $(ROOTFS_$(2)_DEPENDENCIES) host-fakeroot makedevs $(if $(BR2_TARGET_ROOTFS_$(2)_LZMA),host-lzma) + @$(call MESSAGE,"Generating root filesystem image rootfs.$(1)") + $(foreach hook,$(ROOTFS_$(2)_PRE_GEN_HOOKS),$(call $(hook))$(sep)) + rm -f $(FAKEROOT_SCRIPT) + touch $(BUILD_DIR)/.fakeroot.00000 + cat $(BUILD_DIR)/.fakeroot* > $(FAKEROOT_SCRIPT) + echo "chown -R 0:0 $(TARGET_DIR)" >> $(FAKEROOT_SCRIPT) +ifneq ($(TARGET_DEVICE_TABLE),) + echo "$(HOST_DIR)/usr/bin/makedevs -d $(TARGET_DEVICE_TABLE) $(TARGET_DIR)" >> $(FAKEROOT_SCRIPT) +endif + echo "$(ROOTFS_$(2)_CMD)" >> $(FAKEROOT_SCRIPT) + chmod a+x $(FAKEROOT_SCRIPT) + $(HOST_DIR)/usr/bin/fakeroot -- $(FAKEROOT_SCRIPT) + -@rm -f $(FAKEROOT_SCRIPT) + $(foreach hook,$(ROOTFS_$(2)_POST_GEN_HOOKS),$(call $(hook))$(sep)) +ifeq ($$(BR2_TARGET_ROOTFS_$(2)_GZIP),y) + gzip -9 -c $$@ > $$@.gz +endif +ifeq ($$(BR2_TARGET_ROOTFS_$(2)_BZIP2),y) + bzip2 -9 -c $$@ > $$@.bz2 +endif +ifeq ($$(BR2_TARGET_ROOTFS_$(2)_LZMA),y) + $(LZMA) -9 -c $$@ > $$@.lzma +endif + +$(1)-root: $(BINARIES_DIR)/rootfs.$(1) + +ifeq ($$(BR2_TARGET_ROOTFS_$(2)),y) +TARGETS += $(1)-root +endif +endef + +define ROOTFS_TARGET +$(call ROOTFS_TARGET_INTERNAL,$(1),$(call UPPERCASE,$(1))) +endef + +include fs/*/*.mk diff --git a/target/cpio/Config.in b/fs/cpio/Config.in index 83bdd21e0..374cfe0cd 100644 --- a/target/cpio/Config.in +++ b/fs/cpio/Config.in @@ -1,6 +1,5 @@ config BR2_TARGET_ROOTFS_CPIO bool "cpio the root filesystem" - select BR2_HOST_FAKEROOT help Build a cpio archive of the root filesystem @@ -20,31 +19,16 @@ config BR2_TARGET_ROOTFS_CPIO_GZIP bool "gzip" help Do compress the cpio filesystem with gzip. - Note that you either have to have gzip installed on your host - or select to build a gzip for your host. See the packages submenu. config BR2_TARGET_ROOTFS_CPIO_BZIP2 bool "bzip2" help Do compress the cpio filesystem with bzip2. - Note that you either have to have bzip2 installed on your host - or select to build a bzip2 for your host. See the packages submenu. config BR2_TARGET_ROOTFS_CPIO_LZMA bool "lzma" help Do compress the cpio filesystem with lzma. - Note that you either have to have lzma installed on your host - or select to build a lzma for your host. See the packages submenu. endchoice -config BR2_TARGET_ROOTFS_CPIO_COPYTO - string "also copy the image to..." - depends on BR2_TARGET_ROOTFS_CPIO - default "" - help - Copies the resulting image to a secondary location - like a tftp server's root directory. - - Example: $(IMAGE)-$(DATE).cpio$(CPIO_ROOTFS_COMPRESSOR_EXT) diff --git a/fs/cpio/cpio.mk b/fs/cpio/cpio.mk new file mode 100644 index 000000000..ab7d54618 --- /dev/null +++ b/fs/cpio/cpio.mk @@ -0,0 +1,18 @@ +############################################################# +# +# cpio to archive target filesystem +# +############################################################# + +define ROOTFS_CPIO_INIT_SYMLINK + rm -f $(TARGET_DIR)/init + ln -s sbin/init $(TARGET_DIR)/init +endef + +ROOTFS_CPIO_PRE_GEN_HOOKS += ROOTFS_CPIO_INIT_SYMLINK + +define ROOTFS_CPIO_CMD + cd $(TARGET_DIR) && find . | cpio --quiet -o -H newc > $$@ +endef + +$(eval $(call ROOTFS_TARGET,cpio))
\ No newline at end of file diff --git a/target/cramfs/Config.in b/fs/cramfs/Config.in index 0c1cb7822..1a4e32647 100644 --- a/target/cramfs/Config.in +++ b/fs/cramfs/Config.in @@ -1,6 +1,5 @@ config BR2_TARGET_ROOTFS_CRAMFS bool "cramfs root filesystem" - select BR2_HOST_FAKEROOT help Build a cramfs root filesystem diff --git a/fs/cramfs/cramfs.mk b/fs/cramfs/cramfs.mk new file mode 100644 index 000000000..ccd316f5d --- /dev/null +++ b/fs/cramfs/cramfs.mk @@ -0,0 +1,22 @@ +############################################################# +# +# Build the cramfs root filesystem image +# +############################################################# +ifeq ($(BR2_ENDIAN),"BIG") +CRAMFS_OPTS=-b +else +CRAMFS_OPTS=-l +endif + +ifneq ($(TARGET_DEVICE_TABLE),) +CRAMFS_OPTS += -D $(TARGET_DEVICE_TABLE) +endif + +define ROOTFS_CRAMFS_CMD + $(HOST_DIR)/usr/bin/mkcramfs -q $(CRAMFS_OPTS) $(TARGET_DIR) $$@ +endef + +ROOTFS_CRAMFS_DEPENDENCIES = host-cramfs + +$(eval $(call ROOTFS_TARGET,cramfs))
\ No newline at end of file diff --git a/target/ext2/Config.in b/fs/ext2/Config.in index e94fb401c..5c041d95d 100644 --- a/target/ext2/Config.in +++ b/fs/ext2/Config.in @@ -1,7 +1,6 @@ config BR2_TARGET_ROOTFS_EXT2 bool "ext2 root filesystem" default y - select BR2_HOST_FAKEROOT help Build an ext2 root filesystem @@ -25,11 +24,6 @@ config BR2_TARGET_ROOTFS_EXT2_SQUASH depends on BR2_TARGET_ROOTFS_EXT2 default y -config BR2_TARGET_ROOTFS_EXT2_OUTPUT - string "Output File" - depends on BR2_TARGET_ROOTFS_EXT2 - default "$(IMAGE).ext2" - choice prompt "Compression method" default BR2_TARGET_ROOTFS_EXT2_NONE @@ -46,30 +40,16 @@ config BR2_TARGET_ROOTFS_EXT2_GZIP bool "gzip" help Do compress the ext2 filesystem with gzip. - Note that you either have to have gzip installed on your host - or select to build a gzip for your host. See the packages submenu. config BR2_TARGET_ROOTFS_EXT2_BZIP2 bool "bzip2" help Do compress the ext2 filesystem with bzip2. - Note that you either have to have bzip2 installed on your host - or select to build a bzip2 for your host. See the packages submenu. config BR2_TARGET_ROOTFS_EXT2_LZMA bool "lzma" help Do compress the ext2 filesystem with lzma. - Note that you either have to have lzma installed on your host - or select to build a lzma for your host. See the packages submenu. endchoice -config BR2_TARGET_ROOTFS_EXT2_COPYTO - string "also copy the image to..." - depends on BR2_TARGET_ROOTFS_EXT2 - default "" - help - Copies the resulting image to a secondary location - like a tftp server's root directory. - diff --git a/fs/ext2/ext2.mk b/fs/ext2/ext2.mk new file mode 100644 index 000000000..68b3b813c --- /dev/null +++ b/fs/ext2/ext2.mk @@ -0,0 +1,40 @@ +############################################################# +# +# Build the ext2 root filesystem image +# +############################################################# + +EXT2_OPTS := + +ifeq ($(BR2_TARGET_ROOTFS_EXT2_SQUASH),y) +EXT2_OPTS += -U +endif + +ifneq ($(strip $(BR2_TARGET_ROOTFS_EXT2_BLOCKS)),0) +EXT2_OPTS += -b $(BR2_TARGET_ROOTFS_EXT2_BLOCKS) +endif + +ifneq ($(strip $(BR2_TARGET_ROOTFS_EXT2_INODES)),0) +EXT2_OPTS += -N $(BR2_TARGET_ROOTFS_EXT2_INODES) +endif + +ifneq ($(strip $(BR2_TARGET_ROOTFS_EXT2_RESBLKS)),) +EXT2_OPTS += -m $(BR2_TARGET_ROOTFS_EXT2_RESBLKS) +endif + +ROOTFS_EXT2_DEPENDENCIES = host-genext2fs + +ifeq ($(strip $(BR2_TARGET_ROOTFS_EXT2_BLOCKS)),0) +GENEXT2_REALSIZE=$(shell LC_ALL=C du -s -c -k $(TARGET_DIR) | grep total | sed -e "s/total//") +GENEXT2_ADDTOROOTSIZE=$(shell if [ $(GENEXT2_REALSIZE) -ge 20000 ]; then echo 16384; else echo 2400; fi) +GENEXT2_SIZE=$(shell expr $(GENEXT2_REALSIZE) + $(GENEXT2_ADDTOROOTSIZE)) +GENEXT2_ADDTOINODESIZE=$(shell find $(TARGET_DIR) | wc -l) +GENEXT2_INODES=$(shell expr $(GENEXT2_ADDTOINODESIZE) + 400) +EXT2_OPTS += -b $(GENEXT2_SIZE) -N $(GENEXT2_INODES) +endif + +define ROOTFS_EXT2_CMD + $(HOST_DIR)/usr/bin/genext2fs -d $(TARGET_DIR) $(EXT2_OPTS) $$@ +endef + +$(eval $(call ROOTFS_TARGET,ext2))
\ No newline at end of file diff --git a/target/initramfs/Config.in b/fs/initramfs/Config.in index d53982cb9..d53982cb9 100644 --- a/target/initramfs/Config.in +++ b/fs/initramfs/Config.in diff --git a/target/initramfs/gen_initramfs_list.sh b/fs/initramfs/gen_initramfs_list.sh index 26252b619..26252b619 100644 --- a/target/initramfs/gen_initramfs_list.sh +++ b/fs/initramfs/gen_initramfs_list.sh diff --git a/fs/initramfs/initramfs.mk b/fs/initramfs/initramfs.mk new file mode 100644 index 000000000..cf1fcdbae --- /dev/null +++ b/fs/initramfs/initramfs.mk @@ -0,0 +1,18 @@ +############################################################# +# +# Make a initramfs_list file to be used by gen_init_cpio +# gen_init_cpio is part of the 2.6 linux kernels to build an +# initial ramdisk filesystem based on cpio +# +############################################################# + +define ROOTFS_INITRAMFS_INIT_SYMLINK + rm -f $(TARGET_DIR)/init + ln -s sbin/init $(TARGET_DIR)/init +endef + +define ROOTFS_INITRAMFS_CMD + $(SHELL) target/initramfs/gen_initramfs_list.sh -u 0 -g 0 $(TARGET_DIR) > $$@ +endef + +$(eval $(call ROOTFS_TARGET,initramfs))
\ No newline at end of file diff --git a/target/iso9660/Config.in b/fs/iso9660/Config.in index 0b820630a..ceee52ff9 100644 --- a/target/iso9660/Config.in +++ b/fs/iso9660/Config.in @@ -4,15 +4,9 @@ config BR2_TARGET_ROOTFS_ISO9660 depends on !BR2_KERNEL_none select BR2_TARGET_ROOTFS_EXT2 select BR2_TARGET_GRUB - select BR2_HOST_FAKEROOT help Build a bootable iso9660 image -config BR2_TARGET_ROOTFS_ISO9660_OUTPUT - string "Output File" - depends on BR2_TARGET_ROOTFS_ISO9660 - default "$(IMAGE).iso" - config BR2_TARGET_ROOTFS_ISO9660_BOOT_MENU string "Boot menu.lst file" depends on BR2_TARGET_ROOTFS_ISO9660 diff --git a/fs/iso9660/iso9660.mk b/fs/iso9660/iso9660.mk new file mode 100644 index 000000000..66e2de20b --- /dev/null +++ b/fs/iso9660/iso9660.mk @@ -0,0 +1,49 @@ +############################################################# +# +# Build the iso96600 root filesystem image +# +# Cannot be converted to the ROOTFS_TARGET infrastructure, because of +# the temporary construction in ISO9660_TARGET_DIR. +# +############################################################# + +ISO9660_TARGET_DIR=$(BUILD_DIR)/iso9660 +ISO9660_BOOT_MENU:=$(call qstrip,$(BR2_TARGET_ROOTFS_ISO9660_BOOT_MENU)) +ISO9660_OPTS:= + +ifeq ($(BR2_TARGET_ROOTFS_ISO9660_SQUASH),y) +ISO9660_OPTS+=-U +endif + +$(BINARIES_DIR)/rootfs.iso9660: host-cdrkit host-fakeroot $(LINUX_KERNEL) $(BINARIES_DIR)/rootfs.ext2 grub + @$(call MESSAGE,"Generating root filesystem image rootfs.iso9660") + mkdir -p $(ISO9660_TARGET_DIR) + mkdir -p $(ISO9660_TARGET_DIR)/boot/grub + cp $(GRUB_DIR)/stage2/stage2_eltorito $(ISO9660_TARGET_DIR)/boot/grub/ + cp $(ISO9660_BOOT_MENU) $(ISO9660_TARGET_DIR)/boot/grub/menu.lst + cp $(LINUX_KERNEL) $(ISO9660_TARGET_DIR)/kernel + cp $(EXT2_TARGET) $(ISO9660_TARGET_DIR)/initrd + # Use fakeroot to pretend all target binaries are owned by root + rm -f $(FAKEROOT_SCRIPT) + touch $(BUILD_DIR)/.fakeroot.00000 + cat $(BUILD_DIR)/.fakeroot* > $(FAKEROOT_SCRIPT) + echo "chown -R 0:0 $(ISO9660_TARGET_DIR)" >> $(FAKEROOT_SCRIPT) + # Use fakeroot so mkisofs believes the previous fakery + echo "$(HOST_DIR)/usr/bin/genisoimage -R -b boot/grub/stage2_eltorito -no-emul-boot " \ + "-boot-load-size 4 -boot-info-table -o $@ $(ISO9660_TARGET_DIR)" \ + >> $(FAKEROOT_SCRIPT) + chmod a+x $(FAKEROOT_SCRIPT) + $(HOST_DIR)/usr/bin/fakeroot -- $(FAKEROOT_SCRIPT) + -@rm -f $(FAKEROOT_SCRIPT) + -@rm -rf $(ISO9660_TARGET_DIR) + +iso9660-root: $(BINARIES_DIR)/rootfs.iso9660 + +############################################################# +# +# Toplevel Makefile options +# +############################################################# +ifeq ($(BR2_TARGET_ROOTFS_ISO9660),y) +TARGETS+=iso9660-root +endif diff --git a/target/iso9660/menu.lst b/fs/iso9660/menu.lst index d78caebe1..d78caebe1 100644 --- a/target/iso9660/menu.lst +++ b/fs/iso9660/menu.lst diff --git a/target/jffs2/Config.in b/fs/jffs2/Config.in index bcb4d5120..b787ec9d1 100644 --- a/target/jffs2/Config.in +++ b/fs/jffs2/Config.in @@ -1,6 +1,5 @@ config BR2_TARGET_ROOTFS_JFFS2 bool "jffs2 root filesystem" - select BR2_HOST_FAKEROOT help Build a jffs2 root filesystem @@ -115,14 +114,4 @@ config BR2_TARGET_ROOTFS_JFFS2_SUMMARY A summarised image can be mounted faster if support is enabled in the kernel (CONFIG_JFFS2_SUMMARY) -config BR2_TARGET_ROOTFS_JFFS2_OUTPUT - string "Output File" - default "$(IMAGE).jffs2" - -config BR2_TARGET_ROOTFS_JFFS2_COPYTO - string "also copy the image to..." - default "" - help - Copies the resulting image to a secondary location. - endif diff --git a/fs/jffs2/jffs2.mk b/fs/jffs2/jffs2.mk new file mode 100644 index 000000000..a0a563d18 --- /dev/null +++ b/fs/jffs2/jffs2.mk @@ -0,0 +1,61 @@ +############################################################# +# +# Build the jffs2 root filesystem image +# +############################################################# + +JFFS2_OPTS := -e $(BR2_TARGET_ROOTFS_JFFS2_EBSIZE) +SUMTOOL_OPTS := $(JFFS2_OPTS) + +ifeq ($(BR2_TARGET_ROOTFS_JFFS2_PAD),y) +ifneq ($(strip $(BR2_TARGET_ROOTFS_JFFS2_PADSIZE)),0x0) +JFFS2_OPTS += --pad=$(strip $(BR2_TARGET_ROOTFS_JFFS2_PADSIZE)) +else +JFFS2_OPTS += -p +endif +SUMTOOL_OPTS += -p +endif + +ifeq ($(BR2_TARGET_ROOTFS_JFFS2_LE),y) +JFFS2_OPTS += -l +SUMTOOL_OPTS += -l +endif + +ifeq ($(BR2_TARGET_ROOTFS_JFFS2_BE),y) +JFFS2_OPTS += -b +SUMTOOL_OPTS += -b +endif + +JFFS2_OPTS += -s $(BR2_TARGET_ROOTFS_JFFS2_PAGESIZE) +ifeq ($(BR2_TARGET_ROOTFS_JFFS2_NOCLEANMARKER),y) +JFFS2_OPTS += -n +SUMTOOL_OPTS += -n +endif + +ifneq ($(TARGET_DEVICE_TABLE),) +JFFS2_OPTS += -D $(TARGET_DEVICE_TABLE) +endif + +ROOTFS_JFFS2_DEPENDENCIES = host-mtd + +ifneq ($(BR2_TARGET_ROOTFS_JFFS2_SUMMARY),) +define ROOTFS_JFFS2_CMD + $(MKFS_JFFS2) $(JFFS2_OPTS) -d $(TARGET_DIR) -o $$@.nosummary && \ + $(SUMTOOL) $(SUMTOOL_OPTS) -i $$@.nosummary -o $$@ && \ + rm $$@.nosummary +endef +else +define ROOTFS_JFFS2_CMD + $(MKFS_JFFS2) $(JFFS2_OPTS) -d $(TARGET_DIR) -o $$@ +endef +endif + +define JFFS2_GEN_SREC + $(TARGET_CROSS)objcopy -I binary -O srec --adjust-vma 0xa1000000 $$@ $$@.srec +endef + +ifeq ($(BR2_JFFS2_TARGET_SREC),y) +ROOTFS_JFFS2_POST_GEN_HOOKS += JFFS2_GEN_SREC +endif + +$(eval $(call ROOTFS_TARGET,jffs2))
\ No newline at end of file diff --git a/target/romfs/Config.in b/fs/romfs/Config.in index 03a23d413..7a8c663dd 100644 --- a/target/romfs/Config.in +++ b/fs/romfs/Config.in @@ -1,6 +1,5 @@ config BR2_TARGET_ROOTFS_ROMFS bool "romfs root filesystem" - select BR2_HOST_FAKEROOT help Build a romfs image of the root filesystem. diff --git a/fs/romfs/romfs.mk b/fs/romfs/romfs.mk new file mode 100644 index 000000000..971947880 --- /dev/null +++ b/fs/romfs/romfs.mk @@ -0,0 +1,15 @@ +############################################################# +# +# Build the romfs root filesystem image +# +############################################################# + +ROMFS_TARGET=$(IMAGE).romfs + +ROOTFS_ROMFS_DEPENDENCIES = host-genromfs + +define ROOTFS_ROMFS_CMD + $(HOST_DIR)/usr/bin/genromfs -d $(TARGET_DIR) -f $$@ +endef + +$(eval $(call ROOTFS_TARGET,romfs))
\ No newline at end of file diff --git a/fs/squashfs/Config.in b/fs/squashfs/Config.in new file mode 100644 index 000000000..6cc8fcae0 --- /dev/null +++ b/fs/squashfs/Config.in @@ -0,0 +1,4 @@ +config BR2_TARGET_ROOTFS_SQUASHFS + bool "squashfs root filesystem" + help + Build a squashfs root filesystem diff --git a/fs/squashfs/squashfs.mk b/fs/squashfs/squashfs.mk new file mode 100644 index 000000000..d72388ebf --- /dev/null +++ b/fs/squashfs/squashfs.mk @@ -0,0 +1,13 @@ +############################################################# +# +# Build the squashfs root filesystem image +# +############################################################# + +ROOTFS_SQUASHFS_DEPENDENCIES = host-squashfs + +define ROOTFS_SQUASHFS_CMD + $(HOST_DIR)/usr/bin/mksquashfs $(TARGET_DIR) $$@ -noappend +endef + +$(eval $(call ROOTFS_TARGET,squashfs))
\ No newline at end of file diff --git a/target/tar/Config.in b/fs/tar/Config.in index 020965480..5aaf9bd55 100644 --- a/target/tar/Config.in +++ b/fs/tar/Config.in @@ -1,6 +1,5 @@ config BR2_TARGET_ROOTFS_TAR bool "tar the root filesystem" - select BR2_HOST_FAKEROOT help Build a tar archive of the root filesystem @@ -20,22 +19,16 @@ config BR2_TARGET_ROOTFS_TAR_GZIP bool "gzip" help Do compress the tarball with gzip. - Note that you either have to have gzip installed on your host - or select to build a gzip for your host. See the packages submenu. config BR2_TARGET_ROOTFS_TAR_BZIP2 bool "bzip2" help Do compress the tarball with bzip2. - Note that you either have to have bzip2 installed on your host - or select to build a bzip2 for your host. See the packages submenu. config BR2_TARGET_ROOTFS_TAR_LZMA bool "lzma" help Do compress the tarball with lzma. - Note that you either have to have lzma installed on your host - or select to build a lzma for your host. See the packages submenu. endchoice @@ -46,14 +39,3 @@ config BR2_TARGET_ROOTFS_TAR_OPTIONS help Any other flags you want to pass to tar Refer to tar --help for details - -config BR2_TARGET_ROOTFS_TAR_COPYTO - string "also copy the image to..." - depends on BR2_TARGET_ROOTFS_TAR - default "" - help - Copies the resulting image to a secondary location - like a tftp server's root directory. - - Example: $(IMAGE)-$(DATE).tar - diff --git a/fs/tar/tar.mk b/fs/tar/tar.mk new file mode 100644 index 000000000..4d435cb33 --- /dev/null +++ b/fs/tar/tar.mk @@ -0,0 +1,13 @@ +############################################################# +# +# tar to archive target filesystem +# +############################################################# + +TAR_OPTS:=$(BR2_TARGET_ROOTFS_TAR_OPTIONS) + +define ROOTFS_TAR_CMD + tar -c$(TAR_OPTS)f $$@ -C $(TARGET_DIR) . +endef + +$(eval $(call ROOTFS_TARGET,tar)) diff --git a/target/ubifs/Config.in b/fs/ubifs/Config.in index 886c34bfb..bcf409cad 100644 --- a/target/ubifs/Config.in +++ b/fs/ubifs/Config.in @@ -1,7 +1,5 @@ config BR2_TARGET_ROOTFS_UBIFS bool "ubifs root filesystem" - depends on BROKEN # upstream git gone, should use mtd-utils - select BR2_HOST_FAKEROOT help Build a ubifs root filesystem @@ -24,11 +22,6 @@ config BR2_TARGET_ROOTFS_UBIFS_MAXLEBCNT help Some comment required here -config BR2_TARGET_ROOTFS_UBIFS_OUTPUT - string "Output File" - depends on BR2_TARGET_ROOTFS_UBIFS - default "$(IMAGE).ubifs" - choice prompt "ubifs runtime compression" default BR2_TARGET_ROOTFS_UBIFS_RT_LZO @@ -71,33 +64,16 @@ config BR2_TARGET_ROOTFS_UBIFS_GZIP bool "gzip" help Do compress the ubifs filesystem with gzip. - Note that you either have to have gzip installed on your - host or select to build a gzip for your host. See the - packages submenu. config BR2_TARGET_ROOTFS_UBIFS_BZIP2 bool "bzip2" help Do compress the ubifs filesystem with bzip2. - Note that you either have to have bzip2 installed on your - host or select to build a bzip2 for your host. See the - packages submenu. config BR2_TARGET_ROOTFS_UBIFS_LZMA bool "lzma" help Do compress the ubifs filesystem with lzma. - Note that you either have to have lzma installed on your - host or select to build a lzma for your host. See the - packages submenu. endchoice -config BR2_TARGET_ROOTFS_UBIFS_COPYTO - string "also copy the image to..." - depends on BR2_TARGET_ROOTFS_UBIFS - default "" - help - Copies the resulting image to a secondary location - like a tftp server's root directory. - diff --git a/fs/ubifs/ubifs.mk b/fs/ubifs/ubifs.mk new file mode 100644 index 000000000..0fad23421 --- /dev/null +++ b/fs/ubifs/ubifs.mk @@ -0,0 +1,25 @@ +############################################################# +# +# Build the ubifs root filesystem image +# +############################################################# + +UBIFS_OPTS := -e $(BR2_TARGET_ROOTFS_UBIFS_LEBSIZE) -c $(BR2_TARGET_ROOTFS_UBIFS_MAXLEBCNT) -m $(BR2_TARGET_ROOTFS_UBIFS_MINIOSIZE) + +ifeq ($(BR2_TARGET_ROOTFS_UBIFS_RT_ZLIB),y) +UBIFS_OPTS += -x zlib +endif +ifeq ($(BR2_TARGET_ROOTFS_UBIFS_RT_LZI),y) +UBIFS_OPTS += -x lzo +endif +ifeq ($(BR2_TARGET_ROOTFS_UBIFS_RT_NONE),y) +UBIFS_OPTS += -x none +endif + +ROOTFS_UBIFS_DEPENDENCIES = host-mtd + +define ROOTFS_UBIFS_CMD + $(HOST_DIR)/usr/sbin/mkfs.ubifs -d $(TARGET_DIR) $(UBIFS_OPTS) -o $$@ +endef + +$(eval $(call ROOTFS_TARGET,ubifs))
\ No newline at end of file diff --git a/package/Config.in b/package/Config.in index 6a695cbf4..0dac9498f 100644 --- a/package/Config.in +++ b/package/Config.in @@ -146,6 +146,8 @@ endmenu menu "Hardware handling" source "package/acpid/Config.in" +source "package/cdrkit/Config.in" +source "package/cramfs/Config.in" source "package/dbus/Config.in" source "package/dbus-glib/Config.in" source "package/dbus-python/Config.in" @@ -159,6 +161,8 @@ source "package/eeprog/Config.in" source "package/fconfig/Config.in" source "package/fis/Config.in" source "package/gadgetfs-test/Config.in" +source "package/genext2fs/Config.in" +source "package/genromfs/Config.in" source "package/gvfs/Config.in" source "package/hal/Config.in" if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS @@ -184,6 +188,7 @@ if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS source "package/sfdisk/Config.in" endif source "package/smartmontools/Config.in" +source "package/squashfs/Config.in" source "package/sshfs/Config.in" source "package/sysstat/Config.in" if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS @@ -291,6 +296,7 @@ source "package/libupnp/Config.in" endmenu menu "Other" +source "package/libcap/Config.in" source "package/libdaemon/Config.in" source "package/libelf/Config.in" source "package/libevent/Config.in" diff --git a/package/Makefile.in b/package/Makefile.in index 2bd364013..efb4dec34 100644 --- a/package/Makefile.in +++ b/package/Makefile.in @@ -109,7 +109,6 @@ TOOLCHAIN_DIR=$(BASE_DIR)/toolchain # Quotes are needed for spaces et al in path components. TARGET_PATH="$(TOOLCHAIN_DIR)/bin:$(HOST_DIR)/bin:$(HOST_DIR)/usr/bin:$(HOST_DIR)/usr/sbin/:$(STAGING_DIR)/bin:$(STAGING_DIR)/usr/bin:$(PATH)" -IMAGE:=$(BINARIES_DIR)/$(BR2_ROOTFS_PREFIX).$(ARCH)$(ROOTFS_SUFFIX) GNU_TARGET_NAME=$(OPTIMIZE_FOR_CPU)-linux REAL_GNU_TARGET_NAME=$(OPTIMIZE_FOR_CPU)$(GNU_TARGET_SUFFIX) TARGET_CROSS=$(STAGING_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)- @@ -119,9 +118,6 @@ TOOLCHAIN_EXTERNAL_PREFIX:=$(call qstrip,$(BR2_TOOLCHAIN_EXTERNAL_PREFIX)) TOOLCHAIN_EXTERNAL_PATH:=$(call qstrip,$(BR2_TOOLCHAIN_EXTERNAL_PATH)) TOOLCHAIN_DIR=$(BASE_DIR)/toolchain TARGET_PATH="$(HOST_DIR)/bin:$(HOST_DIR)/usr/bin:$(HOST_DIR)/usr/sbin/:$(TOOLCHAIN_DIR)/bin:$(TOOLCHAIN_EXTERNAL_PATH)/bin:$(PATH)" -#IMAGE:=$(BINARIES_DIR)/$(BR2_ROOTFS_PREFIX).$(TOOLCHAIN_EXTERNAL_PREFIX)$(ROOTFS_SUFFIX) -IMAGE:=$(BINARIES_DIR)/$(BR2_ROOTFS_PREFIX).$(ARCH)$(ROOTFS_SUFFIX) - REAL_GNU_TARGET_NAME=$(TOOLCHAIN_EXTERNAL_PREFIX) GNU_TARGET_NAME=$(TOOLCHAIN_EXTERNAL_PREFIX) KERNEL_CROSS=$(TOOLCHAIN_EXTERNAL_PATH)/bin/$(TOOLCHAIN_EXTERNAL_PREFIX)- diff --git a/package/busybox/initramfs.mk b/package/busybox/initramfs.mk index afb80f9f3..394f483e5 100644 --- a/package/busybox/initramfs.mk +++ b/package/busybox/initramfs.mk @@ -7,7 +7,7 @@ ifeq ($(BR2_PACKAGE_BUSYBOX_INITRAMFS),y) BUSYBOX_INITRAMFS_DIR:=$(BUSYBOX_DIR)-initramfs BR2_INITRAMFS_DIR:=$(BUILD_DIR)/initramfs -BB_INITRAMFS_TARGET:=$(IMAGE).initramfs_lst +BB_INITRAMFS_TARGET:=rootfs.initramfs_lst $(BUSYBOX_INITRAMFS_DIR)/.unpacked: $(DL_DIR)/$(BUSYBOX_SOURCE) rm -rf $(BUILD_DIR)/tmp $(BUSYBOX_INITRAMFS_DIR) diff --git a/package/bzip2/bzip2.mk b/package/bzip2/bzip2.mk index 98de5326d..43ab5f265 100644 --- a/package/bzip2/bzip2.mk +++ b/package/bzip2/bzip2.mk @@ -3,65 +3,55 @@ # bzip2 # ############################################################# -BZIP2_VERSION:=1.0.4 +BZIP2_VERSION:=1.0.5 BZIP2_SOURCE:=bzip2-$(BZIP2_VERSION).tar.gz BZIP2_SITE:=http://www.bzip.org/$(BZIP2_VERSION) -BZIP2_DIR:=$(BUILD_DIR)/bzip2-$(BZIP2_VERSION) -BZIP2_CAT:=$(ZCAT) -BZIP2_BINARY:=$(BZIP2_DIR)/bzip2 -BZIP2_TARGET_BINARY:=$(TARGET_DIR)/usr/bin/bzmore +BZIP2_STAGING_INSTALL=YES -$(DL_DIR)/$(BZIP2_SOURCE): - $(call DOWNLOAD,$(BZIP2_SITE),$(BZIP2_SOURCE)) +define BZIP2_FIX_MAKEFILE + $(SED) "s,ln \$$(,ln -snf \$$(,g" $(@D)/Makefile + $(SED) "s,ln -s (lib.*),ln -snf \$$1; ln -snf libbz2.so.$(BZIP2_VERSION) \ + libbz2.so,g" $(@D)/Makefile-libbz2_so + $(SED) "s:-O2:$(TARGET_CFLAGS):" $(@D)/Makefile + $(SED) "s:-O2:$(TARGET_CFLAGS):" $(@D)/Makefile-libbz2_so +endef -bzip2-source: $(DL_DIR)/$(BZIP2_SOURCE) +BZIP2_POST_PATCH_HOOKS += BZIP2_FIX_MAKEFILE + +define BZIP2_NOLARGEFILE_FIX_MAKEFILE + $(SED) "s,^BIGFILES,#BIGFILES,g" $(@D)/Makefile + $(SED) "s,^BIGFILES,#BIGFILES,g" $(@D)/Makefile-libbz2_so +endef -$(BZIP2_DIR)/.unpacked: $(DL_DIR)/$(BZIP2_SOURCE) - $(BZIP2_CAT) $(DL_DIR)/$(BZIP2_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - - $(SED) "s,ln \$$(,ln -snf \$$(,g" $(BZIP2_DIR)/Makefile - $(SED) "s,ln -s (lib.*),ln -snf \$$1; ln -snf libbz2.so.$(BZIP2_VERSION) \ - libbz2.so,g" $(BZIP2_DIR)/Makefile-libbz2_so ifneq ($(BR2_LARGEFILE),y) - $(SED) "s,^BIGFILES,#BIGFILES,g" $(BZIP2_DIR)/Makefile - $(SED) "s,^BIGFILES,#BIGFILES,g" $(BZIP2_DIR)/Makefile-libbz2_so +BZIP2_POST_PATCH_HOOKS += BZIP2_NOLARGEFILE_FIX_MAKEFILE endif - $(SED) "s:-O2:$(TARGET_CFLAGS):" $(BZIP2_DIR)/Makefile - $(SED) "s:-O2:$(TARGET_CFLAGS):" $(BZIP2_DIR)/Makefile-libbz2_so - touch $@ -$(STAGING_DIR)/usr/lib/libbz2.so.$(BZIP2_VERSION): $(BZIP2_DIR)/.unpacked - $(TARGET_CONFIGURE_OPTS) \ - $(MAKE) CC=$(TARGET_CC) RANLIB=$(TARGET_RANLIB) AR=$(TARGET_AR) \ - -C $(BZIP2_DIR) -f Makefile-libbz2_so - $(TARGET_CONFIGURE_OPTS) \ - $(MAKE) CC=$(TARGET_CC) RANLIB=$(TARGET_RANLIB) AR=$(TARGET_AR) \ - -C $(BZIP2_DIR) libbz2.a - cp $(BZIP2_DIR)/bzlib.h $(STAGING_DIR)/usr/include/ - cp $(BZIP2_DIR)/libbz2.so.$(BZIP2_VERSION) $(STAGING_DIR)/usr/lib/ - cp $(BZIP2_DIR)/libbz2.a $(STAGING_DIR)/usr/lib/ +define BZIP2_BUILD_CMDS + $(TARGET_MAKE_ENV) \ + $(MAKE) -C $(@D) -f Makefile-libbz2_so \ + CC="$(TARGET_CC)" RANLIB="$(TARGET_RANLIB)" AR="$(TARGET_AR)" + $(TARGET_MAKE_ENV) \ + $(MAKE) -C $(@D) \ + CC="$(TARGET_CC)" RANLIB="$(TARGET_RANLIB)" AR="$(TARGET_AR)" \ + libbz2.a bzip2 bzip2recover +endef + +define BZIP2_INSTALL_STAGING_CMDS + cp $(@D)/bzlib.h $(STAGING_DIR)/usr/include/ + cp $(@D)/libbz2.so.$(BZIP2_VERSION) $(STAGING_DIR)/usr/lib/ + cp $(@D)/libbz2.a $(STAGING_DIR)/usr/lib/ (cd $(STAGING_DIR)/usr/lib/; \ ln -snf libbz2.so.$(BZIP2_VERSION) libbz2.so; \ - ) - (cd $(STAGING_DIR)/usr/lib; \ ln -snf libbz2.so.$(BZIP2_VERSION) libbz2.so.1.0; \ ln -snf libbz2.so.$(BZIP2_VERSION) libbz2.so.1; \ ) +endef -$(BZIP2_BINARY): $(STAGING_DIR)/usr/lib/libbz2.so.$(BZIP2_VERSION) - $(TARGET_CONFIGURE_OPTS) \ - $(MAKE) CC=$(TARGET_CC) -C $(BZIP2_DIR) bzip2 bzip2recover - touch -c $@ - -$(BZIP2_TARGET_BINARY): $(BZIP2_BINARY) - (cd $(TARGET_DIR)/usr/bin; \ - rm -f bzip2 bunzip2 bzcat bzip2recover \ - bzgrep bzegrep bzfgrep bzmore bzless bzdiff bzcmp; \ - ) - $(TARGET_CONFIGURE_OPTS) \ - $(MAKE) PREFIX=$(TARGET_DIR)/usr -C $(BZIP2_DIR) install - rm -f $(TARGET_DIR)/usr/lib/libbz2.a - rm -f $(TARGET_DIR)/usr/include/bzlib.h - cp $(BZIP2_DIR)/libbz2.so.$(BZIP2_VERSION) $(TARGET_DIR)/usr/lib/ +define B2IP_INSTALL_TARGET_CMDS + $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) \ + $(MAKE) PREFIX=$(TARGET_DIR)/usr -C $(@D) install + cp $(@D)/libbz2.so.$(BZIP2_VERSION) $(TARGET_DIR)/usr/lib/ (cd $(TARGET_DIR)/usr/lib; \ ln -snf libbz2.so.$(BZIP2_VERSION) libbz2.so.1.0; \ ln -snf libbz2.so.$(BZIP2_VERSION) libbz2.so; \ @@ -74,47 +64,37 @@ $(BZIP2_TARGET_BINARY): $(BZIP2_BINARY) ln -snf bzgrep bzegrep; \ ln -snf bzgrep bzfgrep; \ ) -ifneq ($(BR2_HAVE_INFOPAGES),y) - rm -rf $(TARGET_DIR)/usr/info -endif -ifneq ($(BR2_HAVE_MANPAGES),y) - rm -rf $(TARGET_DIR)/usr/man -endif - rm -rf $(TARGET_DIR)/share/locale - rm -rf $(TARGET_DIR)/usr/share/doc - -$(TARGET_DIR)/usr/lib/libbz2.a: $(STAGING_DIR)/usr/lib/libbz2.a - mkdir -p $(TARGET_DIR)/usr/include - cp $(STAGING_DIR)/usr/include/bzlib.h $(TARGET_DIR)/usr/include/ - cp $(STAGING_DIR)/usr/lib/libbz2.a $(TARGET_DIR)/usr/lib/ - rm -f $(TARGET_DIR)/lib/libbz2.so - (cd $(TARGET_DIR)/usr/lib; \ - ln -fs /usr/lib/libbz2.so.1.0 libbz2.so; \ - ) - -$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libbz2.so.1.0 - touch -c $@ - -bzip2-headers: $(TARGET_DIR)/usr/lib/libbz2.a - -bzip2: $(BZIP2_TARGET_BINARY) +endef -bzip2-clean: +define BZIP2_CLEAN_CMDS rm -f $(addprefix $(TARGET_DIR),/lib/libbz2.* \ /usr/lib/libbz2.* \ /usr/include/bzlib.h) rm -f $(addprefix $(STAGING_DIR),/lib/libbz2.* \ /usr/lib/libbz2.* \ /usr/include/bzlib.h) - -$(MAKE) -C $(BZIP2_DIR) clean + -$(MAKE) -C $(@D) clean +endef -bzip2-dirclean: - rm -rf $(BZIP2_DIR) +define HOST_BZIP2_FIX_MAKEFILE + $(SED) "s,ln \$$(,ln -snf \$$(,g" $(@D)/Makefile + $(SED) "s,ln -s (lib.*),ln -snf \$$1; ln -snf libbz2.so.$(BZIP2_VERSION) \ + libbz2.so,g" $(@D)/Makefile-libbz2_so + $(SED) "s:-O2:$(HOST_CFLAGS):" $(@D)/Makefile + $(SED) "s:-O2:$(HOST_CFLAGS):" $(@D)/Makefile-libbz2_so +endef -############################################################# -# -# Toplevel Makefile options -# -############################################################# -ifeq ($(BR2_PACKAGE_BZIP2),y) -TARGETS+=bzip2 -endif +HOST_BZIP2_POST_PATCH_HOOKS += HOST_BZIP2_FIX_MAKEFILE + +define HOST_BZIP2_BUILD_CMDS + $(HOST_MAKE_ENV) $(MAKE) -C $(@D) -f Makefile-libbz2_so + $(HOST_MAKE_ENV) $(MAKE) -C $(@D) libbz2.a bzip2 bzip2recover +endef + +define HOST_BZIP2_INSTALL_CMDS + $(HOST_MAKE_ENV) \ + $(MAKE) PREFIX=$(HOST_DIR)/usr -C $(@D) install +endef + +$(eval $(call GENTARGETS,package,bzip2)) +$(eval $(call GENTARGETS,package,bzip2,host))
\ No newline at end of file diff --git a/package/cdrkit/Config.in b/package/cdrkit/Config.in new file mode 100644 index 000000000..2e255819a --- /dev/null +++ b/package/cdrkit/Config.in @@ -0,0 +1,11 @@ +config BR2_PACKAGE_CDRKIT + # Needed for libbz + select BR2_PACKAGE_BZIP2 + select BR2_PACKAGE_LIBCAP + bool "cdrkit" + help + cdrkit is a suite of programs for recording CDs and DVDs, + blanking CD-RW media, creating ISO-9660 filesystem images, + extracting audio CD data, and more. + + http://www.cdrkit.org/ diff --git a/package/cdrkit/cdrkit.mk b/package/cdrkit/cdrkit.mk new file mode 100644 index 000000000..a6a2e80c5 --- /dev/null +++ b/package/cdrkit/cdrkit.mk @@ -0,0 +1,63 @@ +CDRKIT_VERSION=1.1.10 +CDRKIT_SOURCE=cdrkit-$(CDRKIT_VERSION).tar.gz +CDRKIT_SITE=http://www.cdrkit.org/releases/ + +CDRKIT_DEPENDENCIES=libcap bzip2 host-cmake +HOST_CDRKIT_DEPENDENCIES=host-libcap host-cmake host-bzip2 + +ifeq ($(BR2_ENDIAN),"BIG") +CMAKE_ENDIAN_OPT=-DBITFIELDS_HTOL=1 +else +CMAKE_ENDIAN_OPT=-DBITFIELDS_HTOL=0 +endif + +define CDRKIT_CONFIGURE_CMDS + -mkdir $(@D)/build + (cd $(@D)/build ; \ + $(HOST_DIR)/usr/bin/cmake .. \ + -Wno-dev \ + -DCMAKE_SYSTEM_NAME:STRING="Linux" \ + -DCMAKE_C_COMPILER:FILEPATH="$(TARGET_CC)" \ + -DCMAKE_CXX_COMPILER:FILEPATH="$(TARGET_CXX)" \ + -DCMAKE_C_FLAGS:STRING="$(TARGET_CFLAGS)" \ + -DCMAKE_EXE_LINKER_FLAGS:STRING="$(TARGET_LDFLAGS)" \ + -DCMAKE_MODULE_LINKER_FLAGS:STRING="$(TARGET_LDFLAGS)" \ + -DCMAKE_SHARED_LINKER_FLAGS:STRING="$(TARGET_LDFLAGS)" \ + -DCMAKE_FIND_ROOT_PATH:PATH="$(STAGING_DIR)" \ + -DCMAKE_INSTALL_PREFIX:PATH="$(TARGET_DIR)/usr" \ + $(CMAKE_ENDIAN_OPT) \ + ) +endef + +define CDRKIT_BUILD_CMDS + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/build +endef + +define CDRKIT_INSTALL_TARGET_CMDS + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/build install +endef + +define HOST_CDRKIT_CONFIGURE_CMDS + -mkdir $(@D)/build + (cd $(@D)/build ; \ + $(HOST_DIR)/usr/bin/cmake .. \ + -Wno-dev \ + -DCMAKE_C_FLAGS="$(HOST_CFLAGS)" \ + -DCMAKE_EXE_LINKER_FLAGS:STRING="$(HOST_LDFLAGS)" \ + -DCMAKE_MODULE_LINKER_FLAGS:STRING="$(HOST_LDFLAGS)" \ + -DCMAKE_SHARED_LINKER_FLAGS:STRING="$(HOST_LDFLAGS)" \ + -DCMAKE_INSTALL_PREFIX:STRING="$(HOST_DIR)/usr" \ + ) +endef + +define HOST_CDRKIT_BUILD_CMDS + $(HOST_MAKE_ENV) $(MAKE) -C $(@D)/build +endef + +define HOST_CDRKIT_INSTALL_CMDS + $(HOST_MAKE_ENV) $(MAKE) -C $(@D)/build install +endef + +$(eval $(call GENTARGETS,package,cdrkit)) +$(eval $(call GENTARGETS,package,cdrkit,host)) + diff --git a/package/cloop/cloop.mk b/package/cloop/cloop.mk new file mode 100644 index 000000000..f1c1e1c4e --- /dev/null +++ b/package/cloop/cloop.mk @@ -0,0 +1,18 @@ +CLOOP_VERSION=2.631-1 +CLOOP_SOURCE=cloop_$(CLOOP_VERSION).tar.gz +CLOOP_SITE=http://debian-knoppix.alioth.debian.org/sources/ + +HOST_CLOOP_DEPENDENCIES = host-zlib + +define HOST_CLOOP_BUILD_CMDS + $(HOST_MAKE_ENV) $(MAKE1) \ + CFLAGS="$(HOST_CFLAGS) -Wall -O2 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -DUSE_ERROR_SILENT" -C $(@D) APPSONLY=yes +endef + +define HOST_CLOOP_INSTALL_CMDS + install -m 755 $(@D)/create_compressed_fs $(HOST_DIR)/usr/bin + install -m 755 $(@D)/extract_compressed_fs $(HOST_DIR)/usr/bin +endef + +$(eval $(call GENTARGETS,package,cloop)) +$(eval $(call GENTARGETS,package,cloop,host))
\ No newline at end of file diff --git a/package/cmake/cmake.mk b/package/cmake/cmake.mk new file mode 100644 index 000000000..42d4ff5ed --- /dev/null +++ b/package/cmake/cmake.mk @@ -0,0 +1,20 @@ +CMAKE_VERSION=2.8.0 +CMAKE_SOURCE=cmake-$(CMAKE_VERSION).tar.gz +CMAKE_SITE=http://www.cmake.org/files/v2.8/ + +define HOST_CMAKE_CONFIGURE_CMDS + (cd $(@D); \ + ./bootstrap --prefix=$(HOST_DIR)/usr --parallel=$(BR2_JLEVEL) \ + ) +endef + +define HOST_CMAKE_BUILD_CMDS + $(HOST_MAKE_ENV) $(MAKE) -C $(@D) +endef + +define HOST_CMAKE_INSTALL_CMDS + $(HOST_MAKE_ENV) $(MAKE) -C $(@D) install +endef + +$(eval $(call GENTARGETS,package,cmake)) +$(eval $(call GENTARGETS,package,cmake,host))
\ No newline at end of file diff --git a/package/cramfs/Config.in b/package/cramfs/Config.in new file mode 100644 index 000000000..553fb8a73 --- /dev/null +++ b/package/cramfs/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_CRAMFS + bool "cramfs" + help + cramfs is a comporessed read-only filesystem. This package + contains the tools to generate and check a cramfs filesystem. + + http://sourceforge.net/projects/cramfs/
\ No newline at end of file diff --git a/target/cramfs/cramfs-01-devtable.patch b/package/cramfs/cramfs-01-devtable.patch index 884eb8cb8..884eb8cb8 100644 --- a/target/cramfs/cramfs-01-devtable.patch +++ b/package/cramfs/cramfs-01-devtable.patch diff --git a/target/cramfs/cramfs-02-endian.patch b/package/cramfs/cramfs-02-endian.patch index 0da55bfae..0da55bfae 100644 --- a/target/cramfs/cramfs-02-endian.patch +++ b/package/cramfs/cramfs-02-endian.patch diff --git a/target/cramfs/cramfs-03-cygwin_IO.patch b/package/cramfs/cramfs-03-cygwin_IO.patch index 4ea358ede..4ea358ede 100644 --- a/target/cramfs/cramfs-03-cygwin_IO.patch +++ b/package/cramfs/cramfs-03-cygwin_IO.patch diff --git a/package/cramfs/cramfs.mk b/package/cramfs/cramfs.mk new file mode 100644 index 000000000..7b1924e81 --- /dev/null +++ b/package/cramfs/cramfs.mk @@ -0,0 +1,33 @@ +############################################################# +# +# cramfs +# +############################################################# + +CRAMFS_VERSION=1.1 +CRAMFS_SOURCE=cramfs-$(CRAMFS_VERSION).tar.gz +CRAMFS_SITE=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/cramfs + +CRAMFS_DEPENDENCIES = zlib +HOST_CRAMFS_DEPENDENCIES = host-zlib + +define CRAMFS_BUILD_CMDS + $(TARGET_MAKE_ENV) $(MAKE) CC="$(TARGET_CC)" CFLAGS="$(TARGET_CFLAGS)" LDFLAGS="$(TARGET_LDFLAGS)" -C $(@D) +endef + +define CRAMFS_INSTALL_TARGET_CMDS + install -m 755 $(@D)/mkcramfs $(TARGET_DIR)/usr/bin + install -m 755 $(@D)/cramfsck $(TARGET_DIR)/usr/bin +endef + +define HOST_CRAMFS_BUILD_CMDS + $(HOST_MAKE_ENV) $(MAKE) CFLAGS="$(HOST_CFLAGS) -Wall -O2 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64" LDFLAGS="$(HOST_LDFLAGS)" -C $(@D) +endef + +define HOST_CRAMFS_INSTALL_CMDS + install -m 755 $(@D)/mkcramfs $(HOST_DIR)/usr/bin + install -m 755 $(@D)/cramfsck $(HOST_DIR)/usr/bin +endef + +$(eval $(call GENTARGETS,package,cramfs)) +$(eval $(call GENTARGETS,package,cramfs,host)) diff --git a/package/e2fsprogs/e2fsprogs.mk b/package/e2fsprogs/e2fsprogs.mk index 09db99698..af3c3eda2 100644 --- a/package/e2fsprogs/e2fsprogs.mk +++ b/package/e2fsprogs/e2fsprogs.mk @@ -26,7 +26,12 @@ E2FSPROGS_CONF_OPT = \ E2FSPROGS_MAKE_OPT = \ LDCONFIG=true +define HOST_E2FSPROGS_INSTALL_CMDS + $(HOST_MAKE_ENV) $(MAKE) -C $(@D) install install-libs +endef + $(eval $(call AUTOTARGETS,package,e2fsprogs)) +$(eval $(call AUTOTARGETS,package,e2fsprogs,host)) # binaries to keep or remove E2FSPROGS_BINTARGETS_$(BR2_PACKAGE_E2FSPROGS_BADBLOCKS) += usr/sbin/badblocks diff --git a/package/fakeroot/Config.in b/package/fakeroot/Config.in index 679b6b2ca..186b717d4 100644 --- a/package/fakeroot/Config.in +++ b/package/fakeroot/Config.in @@ -4,7 +4,3 @@ config BR2_PACKAGE_FAKEROOT Run commands in an environment faking root privileges. http://joostje.op.het.net/fakeroot/ - -# dummy for fakeroot-source -config BR2_HOST_FAKEROOT - bool diff --git a/package/fakeroot/fakeroot.mk b/package/fakeroot/fakeroot.mk index d525a4f62..a8eff5225 100644 --- a/package/fakeroot/fakeroot.mk +++ b/package/fakeroot/fakeroot.mk @@ -6,125 +6,25 @@ FAKEROOT_VERSION:=1.9.5 FAKEROOT_SOURCE:=fakeroot_$(FAKEROOT_VERSION).tar.gz FAKEROOT_SITE:=http://snapshot.debian.net/archive/2008/04/27/debian/pool/main/f/fakeroot/ -FAKEROOT_CAT:=$(ZCAT) -FAKEROOT_SOURCE_DIR:=$(BUILD_DIR)/fakeroot-$(FAKEROOT_VERSION) -FAKEROOT_DIR1:=$(BUILD_DIR)/fakeroot-$(FAKEROOT_VERSION)-host -FAKEROOT_DIR2:=$(BUILD_DIR)/fakeroot-$(FAKEROOT_VERSION)-target +FAKEROOT_LIBTOOL_PATCH=NO +HOST_FAKEROOT_LIBTOOL_PATCH=NO -$(DL_DIR)/$(FAKEROOT_SOURCE): - $(call DOWNLOAD,$(FAKEROOT_SITE),$(FAKEROOT_SOURCE)) - -fakeroot-source: $(DL_DIR)/$(FAKEROOT_SOURCE) - -$(FAKEROOT_SOURCE_DIR)/.unpacked: $(DL_DIR)/$(FAKEROOT_SOURCE) - $(FAKEROOT_CAT) $(DL_DIR)/$(FAKEROOT_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - +define FAKEROOT_PATCH_FAKEROOT_IN # If using busybox getopt, make it be quiet. $(SED) "s,getopt --version,getopt --version 2>/dev/null," \ - $(FAKEROOT_SOURCE_DIR)/scripts/fakeroot.in - toolchain/patch-kernel.sh $(FAKEROOT_SOURCE_DIR) package/fakeroot/ \*.patch - touch $@ - - -############################################################# -# -# build fakeroot for use on the host system -# -############################################################# + $(@D)/scripts/fakeroot.in +endef -$(FAKEROOT_DIR1)/.configured: $(FAKEROOT_SOURCE_DIR)/.unpacked - mkdir -p $(FAKEROOT_DIR1) - (cd $(FAKEROOT_DIR1); rm -rf config.cache; \ - CC="$(HOSTCC)" \ - $(FAKEROOT_SOURCE_DIR)/configure $(QUIET) \ - --prefix=$(HOST_DIR)/usr \ - ) - touch $@ +FAKEROOT_POST_PATCH_HOOKS += FAKEROOT_PATCH_FAKEROOT_IN -$(FAKEROOT_DIR1)/faked: $(FAKEROOT_DIR1)/.configured - $(MAKE) -C $(FAKEROOT_DIR1) - touch -c $@ - -$(HOST_DIR)/usr/bin/fakeroot: $(FAKEROOT_DIR1)/faked - $(MAKE) -C $(FAKEROOT_DIR1) install - touch -c $@ - -host-fakeroot: $(HOST_DIR)/usr/bin/fakeroot - -host-fakeroot-clean: - -$(MAKE) -C $(FAKEROOT_DIR1) clean - -host-fakeroot-dirclean: - rm -rf $(FAKEROOT_DIR1) - - -############################################################# -# -# build fakeroot for use on the target system -# -############################################################# - -$(FAKEROOT_DIR2)/.configured: $(FAKEROOT_SOURCE_DIR)/.unpacked - mkdir -p $(FAKEROOT_DIR2) - (cd $(FAKEROOT_DIR2); rm -rf config.cache; \ - $(TARGET_CONFIGURE_OPTS) \ - $(TARGET_CONFIGURE_ARGS) \ - $(FAKEROOT_SOURCE_DIR)/configure $(QUIET) \ - --target=$(GNU_TARGET_NAME) \ - --host=$(GNU_TARGET_NAME) \ - --build=$(GNU_HOST_NAME) \ - --prefix=/usr \ - --exec-prefix=/usr \ - --bindir=/usr/bin \ - --sbindir=/usr/sbin \ - --libdir=/usr/lib/libfakeroot \ - --sysconfdir=/etc \ - --datadir=/usr/share \ - --localstatedir=/var \ - --mandir=/usr/share/man \ - --infodir=/usr/share/info \ - $(DISABLE_NLS) \ - ) - touch $@ - -$(FAKEROOT_DIR2)/faked: $(FAKEROOT_DIR2)/.configured - $(MAKE) CC=$(TARGET_CC) -C $(FAKEROOT_DIR2) - touch -c $@ - -$(TARGET_DIR)/usr/bin/fakeroot: $(FAKEROOT_DIR2)/faked - $(MAKE) DESTDIR=$(TARGET_DIR) -C $(FAKEROOT_DIR2) install - -mv $(TARGET_DIR)/usr/bin/$(ARCH)-linux-faked \ +define FAKEROOT_RENAME_TARGET_BINARIES + -mv $(TARGET_DIR)/usr/bin/$(ARCH)-*-faked \ $(TARGET_DIR)/usr/bin/faked - -mv $(TARGET_DIR)/usr/bin/$(ARCH)-linux-fakeroot \ + -mv $(TARGET_DIR)/usr/bin/$(ARCH)-*-fakeroot \ $(TARGET_DIR)/usr/bin/fakeroot -ifneq ($(BR2_HAVE_INFOPAGES),y) - rm -rf $(TARGET_DIR)/usr/share/info -endif -ifneq ($(BR2_HAVE_MANPAGES),y) - rm -rf $(TARGET_DIR)/usr/share/man -endif - rm -rf $(TARGET_DIR)/share/locale - rm -rf $(TARGET_DIR)/usr/share/doc - touch -c $@ - -fakeroot: $(TARGET_DIR)/usr/bin/fakeroot +endef -fakeroot-clean: - -$(MAKE) -C $(FAKEROOT_DIR2) clean - rm -f $(TARGET_DIR)/usr/bin/fake{d,root} - -fakeroot-dirclean: - rm -rf $(FAKEROOT_DIR2) - - -############################################################# -# -# Toplevel Makefile options -# -############################################################# -ifeq ($(BR2_PACKAGE_FAKEROOT),y) -TARGETS+=fakeroot -endif +FAKEROOT_POST_INSTALL_TARGET_HOOKS += FAKEROOT_RENAME_TARGET_BINARIES -ifeq ($(BR2_HOST_FAKEROOT),y) -HOST_SOURCE+=fakeroot-source -endif +$(eval $(call AUTOTARGETS,package,fakeroot)) +$(eval $(call AUTOTARGETS,package,fakeroot,host)) diff --git a/package/genext2fs/Config.in b/package/genext2fs/Config.in new file mode 100644 index 000000000..82992f877 --- /dev/null +++ b/package/genext2fs/Config.in @@ -0,0 +1,9 @@ +config BR2_PACKAGE_GENEXT2FS + bool "genext2fs" + help + genext2fs generates an ext2 filesystem as a normal (non-root) + user. It does not require you to mount the image file to + copy files on it, nor does it require that you become the + superuser to make device nodes. + + http://genext2fs.sourceforge.net/ diff --git a/target/ext2/genext2fs-1.4-nosquash.patch b/package/genext2fs/genext2fs-1.4-nosquash.patch index 236dfccdf..236dfccdf 100644 --- a/target/ext2/genext2fs-1.4-nosquash.patch +++ b/package/genext2fs/genext2fs-1.4-nosquash.patch diff --git a/target/ext2/genext2fs-1.4-remove_ugly_warnings.patch b/package/genext2fs/genext2fs-1.4-remove_ugly_warnings.patch index ef23dfbe8..ef23dfbe8 100644 --- a/target/ext2/genext2fs-1.4-remove_ugly_warnings.patch +++ b/package/genext2fs/genext2fs-1.4-remove_ugly_warnings.patch diff --git a/package/genext2fs/genext2fs.mk b/package/genext2fs/genext2fs.mk new file mode 100644 index 000000000..8c4981edb --- /dev/null +++ b/package/genext2fs/genext2fs.mk @@ -0,0 +1,12 @@ +############################################################# +# +# genext2fs +# +############################################################# + +GENEXT2FS_VERSION=1.4 +GENEXT2FS_SOURCE=genext2fs-$(GENEXT2FS_VERSION).tar.gz +GENEXT2FS_SITE:=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/genext2fs + +$(eval $(call AUTOTARGETS,package,genext2fs)) +$(eval $(call AUTOTARGETS,package,genext2fs,host)) diff --git a/package/genromfs/Config.in b/package/genromfs/Config.in new file mode 100644 index 000000000..2caf2a405 --- /dev/null +++ b/package/genromfs/Config.in @@ -0,0 +1,6 @@ +config BR2_PACKAGE_GENROMFS + bool "genromfs" + help + Tool to generate a ROMFS filesystem. + + http://romfs.sourceforge.net/
\ No newline at end of file diff --git a/package/genromfs/genromfs-0.5.2-build-system.patch b/package/genromfs/genromfs-0.5.2-build-system.patch new file mode 100644 index 000000000..827fe75bd --- /dev/null +++ b/package/genromfs/genromfs-0.5.2-build-system.patch @@ -0,0 +1,26 @@ +--- + Makefile | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) + +Index: genromfs-0.5.2/Makefile +=================================================================== +--- genromfs-0.5.2.orig/Makefile ++++ genromfs-0.5.2/Makefile +@@ -6,8 +6,6 @@ + PACKAGE = genromfs + VERSION = 0.5.2 + CC = gcc +-CFLAGS = -O2 -Wall -DVERSION=\"$(VERSION)\"#-g# +-LDFLAGS = -s#-g + + DISTDIR = $(PACKAGE)-$(VERSION) + +@@ -24,7 +22,7 @@ + $(CC) $(LDFLAGS) genromfs.o -o genromfs + + .c.o: +- $(CC) $(CFLAGS) $< -c -o $@ ++ $(CC) $(CFLAGS) -DVERSION=\"$(VERSION)\" $< -c -o $@ + + clean: + rm -f genromfs *.o diff --git a/package/genromfs/genromfs.mk b/package/genromfs/genromfs.mk new file mode 100644 index 000000000..10b8d7d4b --- /dev/null +++ b/package/genromfs/genromfs.mk @@ -0,0 +1,31 @@ +############################################################# +# +# genromfs +# +############################################################# + +GENROMFS_VERSION=0.5.2 +GENROMFS_SOURCE=genromfs-$(GENROMFS_VERSION).tar.gz +GENROMFS_SITE=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/romfs + +define GENROMFS_BUILD_CMDS + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) \ + CC="$(TARGET_CC)" \ + CFLAGS="$(TARGET_CFLAGS)" \ + LDFLAGS="$(TARGET_LDFLAGS)" +endef + +define GENROMFS_INSTALL_TARGET_CMDS + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) PREFIX=$(TARGET_DIR) install +endef + +define HOST_GENROMFS_BUILD_CMDS + $(HOST_MAKE_ENV) $(MAKE) -C $(@D) +endef + +define HOST_GENROMFS_INSTALL_CMDS + $(HOST_MAKE_ENV) $(MAKE) -C $(@D) PREFIX=$(HOST_DIR) install +endef + +$(eval $(call GENTARGETS,package,genromfs)) +$(eval $(call GENTARGETS,package,genromfs,host))
\ No newline at end of file diff --git a/package/libcap/Config.in b/package/libcap/Config.in new file mode 100644 index 000000000..f1fc8fa16 --- /dev/null +++ b/package/libcap/Config.in @@ -0,0 +1,10 @@ +config BR2_PACKAGE_LIBCAP + bool "libcap" + help + This library implements the user-space interfaces to the + POSIX 1003.1e capabilities available in Linux kernels. These + capabilities are a partitioning of the all powerful root + privilege into a set of distinct privileges. + + http://sites.google.com/site/fullycapable/ + diff --git a/package/libcap/libcap-2.19-build-system.patch b/package/libcap/libcap-2.19-build-system.patch new file mode 100644 index 000000000..42a5518ff --- /dev/null +++ b/package/libcap/libcap-2.19-build-system.patch @@ -0,0 +1,55 @@ +--- + Make.Rules | 15 ++++++++------- + libcap/Makefile | 2 +- + 2 files changed, 9 insertions(+), 8 deletions(-) + +Index: libcap-2.19/Make.Rules +=================================================================== +--- libcap-2.19.orig/Make.Rules ++++ libcap-2.19/Make.Rules +@@ -45,24 +45,25 @@ + KERNEL_HEADERS := $(topdir)/libcap/include + IPATH += -I$(topdir)/libcap/include -I$(KERNEL_HEADERS) + +-CC := gcc +-CFLAGS := -O2 +-BUILD_CC := $(CC) +-BUILD_CFLAGS := $(CFLAGS) $(IPATH) +-AR := ar +-RANLIB := ranlib ++CC ?= gcc ++CFLAGS ?= -O2 ++CC_FOR_BUILD ?= $(CC) ++CFLAGS_FOR_BUILD ?= $(CFLAGS) ++AR ?= ar ++RANLIB ?= ranlib + DEBUG = -g #-DDEBUG + WARNINGS=-fPIC -Wall -Wwrite-strings \ + -Wpointer-arith -Wcast-qual -Wcast-align \ + -Wstrict-prototypes -Wmissing-prototypes \ + -Wnested-externs -Winline -Wshadow + LD=$(CC) -Wl,-x -shared +-LDFLAGS := #-g ++LDFLAGS ?= #-g + + SYSTEM_HEADERS = /usr/include + INCS=$(topdir)/libcap/include/sys/capability.h + LDFLAGS += -L$(topdir)/libcap + CFLAGS += -Dlinux $(WARNINGS) $(DEBUG) $(IPATH) ++CFLAGS_FOR_BUILD += $(IPATH) + PAM_CAP := $(shell if [ -f /usr/include/security/pam_modules.h ]; then echo yes ; else echo no ; fi) + INDENT := $(shell if [ -n "$(which indent 2>/dev/null)" ]; then echo "| indent -kr" ; fi) + DYNAMIC := $(shell if [ ! -d "$(topdir)/.git" ]; then echo yes; fi) +Index: libcap-2.19/libcap/Makefile +=================================================================== +--- libcap-2.19.orig/libcap/Makefile ++++ libcap-2.19/libcap/Makefile +@@ -33,7 +33,7 @@ + endif + + _makenames: _makenames.c cap_names.list.h +- $(BUILD_CC) $(BUILD_CFLAGS) $< -o $@ ++ $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $< -o $@ + + cap_names.h: _makenames + ./_makenames > cap_names.h diff --git a/package/libcap/libcap.mk b/package/libcap/libcap.mk new file mode 100644 index 000000000..3ea5e51aa --- /dev/null +++ b/package/libcap/libcap.mk @@ -0,0 +1,27 @@ +LIBCAP_VERSION=2.19 +LIBCAP_SOURCE=libcap-$(LIBCAP_VERSION).tar.bz2 +LIBCAP_SITE=http://www.kernel.org/pub/linux/libs/security/linux-privs/libcap2/ +LIBCAP_INSTALL_STAGING=YES + +define LIBCAP_BUILD_CMDS + $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) LIBATTR=no +endef + +define LIBCAP_INSTALL_STAGING_CMDS + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) LIBATTR=no DESTDIR=$(STAGING_DIR) install +endef + +define LIBCAP_INSTALL_TARGET_CMDS + install -D $(STAGING_DIR)/usr/lib/libcap.so.* $(TARGET_DIR)/usr/lib +endef + +define HOST_LIBCAP_BUILD_CMDS + $(HOST_MAKE_ENV) $(HOST_CONFIGURE_OPTS) $(MAKE) -C $(@D) LIBATTR=no +endef + +define HOST_LIBCAP_INSTALL_CMDS + $(HOST_MAKE_ENV) $(MAKE) -C $(@D) LIBATTR=no DESTDIR=$(HOST_DIR) install +endef + +$(eval $(call GENTARGETS,package,libcap)) +$(eval $(call GENTARGETS,package,libcap,host)) diff --git a/package/lzma/lzma.mk b/package/lzma/lzma.mk index c4a735def..9bdcc3529 100644 --- a/package/lzma/lzma.mk +++ b/package/lzma/lzma.mk @@ -11,67 +11,6 @@ LZMA_INSTALL_TARGET = YES LZMA_CONF_OPT = $(if $(BR2_ENABLE_DEBUG),--enable-debug,--disable-debug) $(eval $(call AUTOTARGETS,package,lzma)) +$(eval $(call AUTOTARGETS,package,lzma,host)) -###################################################################### -# -# lzma host -# -###################################################################### - -LZMA_CAT:=$(ZCAT) -LZMA_HOST_DIR:=$(TOOLCHAIN_DIR)/lzma-$(LZMA_VERSION) - -# lzma binary for use on the host -LZMA=$(TOOLCHAIN_DIR)/bin/lzma -HOST_LZMA_BINARY=$(shell package/lzma/lzmacheck.sh) -HOST_LZMA_IF_ANY=$(shell toolchain/dependencies/check-host-lzma.sh) - -$(DL_DIR)/$(LZMA_SOURCE): - $(call DOWNLOAD,$(LZMA_SITE),$(LZMA_SOURCE)) - -$(LZMA_HOST_DIR)/.unpacked: $(DL_DIR)/$(LZMA_SOURCE) - $(LZMA_CAT) $(DL_DIR)/$(LZMA_SOURCE) | tar -C $(TOOLCHAIN_DIR) $(TAR_OPTIONS) - - toolchain/patch-kernel.sh $(LZMA_HOST_DIR) package/lzma/ lzma\*.patch - touch $@ - -$(LZMA_HOST_DIR)/.configured: $(LZMA_HOST_DIR)/.unpacked - (cd $(LZMA_HOST_DIR); rm -f config.cache;\ - CC="$(HOSTCC)" \ - CXX="$(HOSTCXX)" \ - ./configure $(QUIET) \ - --prefix=/ \ - ) - touch $@ - -$(LZMA_HOST_DIR)/src/lzma/lzma: $(LZMA_HOST_DIR)/.configured - $(MAKE) -C $(LZMA_HOST_DIR) all - touch -c $@ - -$(STAGING_DIR)/bin/lzma: $(LZMA_HOST_DIR)/src/lzma/lzma - $(MAKE) DESTDIR=$(STAGING_DIR) -C $(LZMA_HOST_DIR) install - $(SED) "s,^libdir=.*,libdir=\'$(STAGING_DIR)/lib\',g" \ - $(STAGING_DIR)/lib/liblzmadec.la - -.PHONY: lzma-host use-lzma-host-binary -use-lzma-host-binary: - if [ ! -f "$(TOOLCHAIN_DIR)/bin/lzma" ]; then \ - [ -d $(TOOLCHAIN_DIR)/bin ] || mkdir -p $(TOOLCHAIN_DIR)/bin; \ - ln -sf "$(HOST_LZMA_IF_ANY)" "$(TOOLCHAIN_DIR)/bin/lzma"; \ - fi - -build-lzma-host-binary: $(LZMA_HOST_DIR)/src/lzma/lzma - -rm -f $(TOOLCHAIN_DIR)/bin/lzma - [ -d $(TOOLCHAIN_DIR)/bin ] || mkdir $(TOOLCHAIN_DIR)/bin - cp -pf $(LZMA_HOST_DIR)/src/lzma/lzma $(TOOLCHAIN_DIR)/bin/lzma - -host-lzma: $(HOST_LZMA_BINARY) - -lzma-host: $(STAGING_DIR)/bin/lzma - -lzma-host-clean: - rm -f $(STAGING_DIR)/bin/lzma - -$(MAKE) -C $(LZMA_HOST_DIR) clean -lzma-host-dirclean: - rm -rf $(LZMA_HOST_DIR) - -lzma-host-install: /usr/local/bin/lzma +LZMA=$(HOST_DIR)/usr/bin/lzma diff --git a/package/mtd/mtd.mk b/package/mtd/mtd.mk index 3e0fcaf80..5a449f28e 100644 --- a/package/mtd/mtd.mk +++ b/package/mtd/mtd.mk @@ -6,65 +6,21 @@ MTD_VERSION:=1.3.1 MTD_SOURCE:=mtd-utils-$(MTD_VERSION).tar.bz2 MTD_SITE:=ftp://ftp.infradead.org/pub/mtd-utils -MTD_DIR:=$(BUILD_DIR)/mtd-utils-$(MTD_VERSION) -MTD_HOST_DIR:= $(MTD_DIR)-host -MTD_CAT:=$(BZCAT) -############################################################# -# -# Build mkfs.jffs2 and sumtool for use on the local host system if -# needed by target/jffs2root. -# -############################################################# -MKFS_JFFS2 := $(HOST_DIR)/usr/sbin/mkfs.jffs2 -SUMTOOL := $(HOST_DIR)/usr/sbin/sumtool - -$(DL_DIR)/$(MTD_SOURCE): - $(call DOWNLOAD,$(MTD_SITE),$(MTD_SOURCE)) - -$(MTD_HOST_DIR)/.unpacked: $(DL_DIR)/$(MTD_SOURCE) - mkdir -p $(@D) - $(MTD_CAT) $^ | tar $(TAR_STRIP_COMPONENTS)=1 -C $(@D) $(TAR_OPTIONS) - - toolchain/patch-kernel.sh $(MTD_HOST_DIR) \ - package/mtd/ mtd-utils-\*.patch - touch $@ - -$(MTD_HOST_DIR)/mkfs.jffs2: $(MTD_HOST_DIR)/.unpacked - CC="$(HOSTCC)" CFLAGS="$(HOST_CFLAGS)" LDFLAGS="$(HOST_LDFLAGS)" \ - CROSS= $(MAKE) BUILDDIR=$(MTD_HOST_DIR) \ - WITHOUT_XATTR=1 -C $(MTD_HOST_DIR) $@ +HOST_MTD_DEPENDENCIES = host-lzo host-e2fsprogs -$(MKFS_JFFS2): $(MTD_HOST_DIR)/mkfs.jffs2 - install -m 0755 -D $^ $@ - -$(MTD_HOST_DIR)/sumtool: $(MTD_HOST_DIR)/.unpacked +define HOST_MTD_BUILD_CMDS CC="$(HOSTCC)" CFLAGS="$(HOST_CFLAGS)" LDFLAGS="$(HOST_LDFLAGS)" \ - CROSS= $(MAKE) BUILDDIR=$(MTD_HOST_DIR) \ - WITHOUT_XATTR=1 -C $(MTD_HOST_DIR) $@ - -$(SUMTOOL): $(MTD_HOST_DIR)/sumtool - install -m 0755 $^ $@ - -mtd-host: host-lzo $(MKFS_JFFS2) $(SUMTOOL) - -mtd-host-source: $(DL_DIR)/$(MTD_SOURCE) + CROSS= $(MAKE) BUILDDIR=$(@D) \ + WITHOUT_XATTR=1 -C $(@D) +endef -mtd-host-clean: - -$(MAKE) -C $(MTD_HOST_DIR) clean - rm -f $(MKFS_JFFS2) $(SUMTOOL) +define HOST_MTD_INSTALL_CMDS + $(MAKE) BUILDDIR=$(@D) DESTDIR=$(HOST_DIR) -C $(@D) install +endef -mtd-host-dirclean: - rm -rf $(MTD_HOST_DIR) - -############################################################# -# -# build mtd for use on the target system -# -############################################################# -$(MTD_DIR)/.unpacked: $(DL_DIR)/$(MTD_SOURCE) - $(MTD_CAT) $(DL_DIR)/$(MTD_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - - toolchain/patch-kernel.sh $(MTD_DIR) package/mtd/ mtd-utils-\*.patch - touch $@ +MKFS_JFFS2=$(HOST_DIR)/usr/sbin/mkfs.jffs2 +SUMTOOL=$(HOST_DIR)/usr/sbin/sumtool MTD_TARGETS_$(BR2_PACKAGE_MTD_DOCFDISK) += docfdisk MTD_TARGETS_$(BR2_PACKAGE_MTD_DOC_LOADBIOS) += doc_loadbios @@ -105,50 +61,42 @@ MTD_TARGETS_UBI_$(BR2_PACKAGE_MTD_UBIRMVOL) += ubirmvol MTD_TARGETS_UBI_$(BR2_PACKAGE_MTD_UBIRSVOL) += ubirsvol MTD_TARGETS_UBI_$(BR2_PACKAGE_MTD_UBIUPDATEVOL) += ubiupdatevol -MTD_TARGETS := $(addprefix $(MTD_DIR)/, $(MTD_TARGETS_y)) -MTD_UBI_TARGETS := $(addprefix $(MTD_DIR)/ubi-utils/, $(MTD_TARGETS_UBI_y)) -MTD_BUILD_TARGETS := $(MTD_TARGETS) $(MTD_UBI_TARGETS) - -$(MTD_BUILD_TARGETS): $(MTD_DIR)/.unpacked -ifneq ($(MTD_TARGETS),) - $(MAKE) $(TARGET_CONFIGURE_ENV) \ - BUILDDIR=$(MTD_DIR) \ - CROSS=$(TARGET_CROSS) CC=$(TARGET_CC) \ - WITHOUT_XATTR=1 WITHOUT_LARGEFILE=1 \ - -C $(MTD_DIR) $(MTD_TARGETS) +MTD_MAKE_COMMON_FLAGS = \ + $(TARGET_CONFIGURE_ENV) \ + CROSS=$(TARGET_CROSS) CC=$(TARGET_CC) \ + WITHOUT_XATTR=1 WITHOUT_LARGEFILE=1 + +ifneq ($(MTD_TARGETS_y),) +define MTD_TARGETS_BUILD + $(MAKE) $(MTD_MAKE_COMMON_FLAGS) \ + BUILDDIR=$(@D) \ + -C $(@D) \ + $(addprefix $(@D)/, $(MTD_TARGETS_y)) +endef endif -ifneq ($(MTD_UBI_TARGETS),) - $(MAKE) $(TARGET_CONFIGURE_ENV) \ - BUILDDIR=$(MTD_DIR)/ubi-utils \ - CROSS=$(TARGET_CROSS) CC=$(TARGET_CC) \ - WITHOUT_XATTR=1 WITHOUT_LARGEFILE=1 \ - -C $(MTD_DIR)/ubi-utils $(MTD_UBI_TARGETS) -endif - -MTD_TARGET_BINS := $(addprefix $(TARGET_DIR)/usr/sbin/,\ - $(MTD_TARGETS_y) $(MTD_TARGETS_UBI_y)) - -$(MTD_TARGET_BINS): $(MTD_BUILD_TARGETS) - mkdir -p $(TARGET_DIR)/usr/sbin - $(INSTALL) -m 0755 $^ $(TARGET_DIR)/usr/sbin - -mtd: $(if $(BR2_PACKAGE_MTD_MKFSJFFS2),zlib lzo) $(MTD_TARGET_BINS) - -mtd-source: $(DL_DIR)/$(MTD_SOURCE) - -mtd-clean: - -$(MAKE) -C $(MTD_DIR) clean - rm -f $(MTD_TARGET_BINS) -mtd-dirclean: - rm -rf $(MTD_DIR) - - -############################################################# -# -# Toplevel Makefile options -# -############################################################# -ifeq ($(BR2_PACKAGE_MTD),y) -TARGETS+=mtd +ifneq ($(MTD_TARGETS_UBI_y),) +define MTD_TARGETS_UBI_BUILD + $(MAKE) $(MTD_MAKE_COMMON_FLAGS) \ + BUILDDIR=$(@D)/ubi-utils/ \ + -C $(@D)/ubi-utils \ + $(addprefix $(@D)/ubi-utils/, $(MTD_TARGETS_UBI_y)) +endef endif + +define MTD_BUILD_CMDS + $(MTD_TARGETS_BUILD) + $(MTD_TARGETS_UBI_BUILD) +endef + +define MTD_INSTALL_TARGET_CMDS + for f in $(MTD_TARGETS_y) ; do \ + install -m 0755 $(@D)/$$f $(TARGET_DIR)/usr/sbin/$$f ; \ + done ; \ + for f in $(MTD_TARGETS_UBI_y) ; do \ + install -m 0755 $(@D)/ubi-utils/$$f $(TARGET_DIR)/usr/sbin/$$f ; \ + done +endef + +$(eval $(call GENTARGETS,package,mtd)) +$(eval $(call GENTARGETS,package,mtd,host)) diff --git a/package/squashfs/Config.in b/package/squashfs/Config.in new file mode 100644 index 000000000..3080cc3ab --- /dev/null +++ b/package/squashfs/Config.in @@ -0,0 +1,6 @@ +config BR2_PACKAGE_SQUASHFS + bool "squashfs" + help + Tools to generate SquashFS filesystems. + + http://squashfs.sourceforge.net/ diff --git a/target/squashfs/squashfs-4.0-build-system-fix.patch b/package/squashfs/squashfs-4.0-build-system-fix.patch index 7ba0ab94a..9db208bff 100644 --- a/target/squashfs/squashfs-4.0-build-system-fix.patch +++ b/package/squashfs/squashfs-4.0-build-system-fix.patch @@ -1,12 +1,7 @@ -Fix the build system so that CFLAGS can be overriden on the command -line to pass additionnal -I options. - -Patch borrowed from OpenEmbedded. - -Index: squashfs-4.0/squashfs-tools/Makefile +Index: a/squashfs-tools/Makefile =================================================================== ---- squashfs-4.0.orig/squashfs-tools.orig/Makefile 2009-04-19 01:47:43.000000000 +0200 -+++ squashfs-4.0/squashfs-tools/Makefile 2009-04-19 01:52:36.000000000 +0200 +--- a/squashfs-tools.orig/Makefile 2009-04-19 01:47:43.000000000 +0200 ++++ b/squashfs-tools/Makefile 2009-04-19 01:52:36.000000000 +0200 @@ -1,36 +1,48 @@ INSTALL_DIR = /usr/local/bin diff --git a/target/squashfs/squashfs-4.0-mksquashfs-race-condition-fix.patch b/package/squashfs/squashfs-4.0-mksquashfs-race-condition-fix.patch index 7f8e8e074..7f8e8e074 100644 --- a/target/squashfs/squashfs-4.0-mksquashfs-race-condition-fix.patch +++ b/package/squashfs/squashfs-4.0-mksquashfs-race-condition-fix.patch diff --git a/package/squashfs/squashfs.mk b/package/squashfs/squashfs.mk new file mode 100644 index 000000000..ab05b06e5 --- /dev/null +++ b/package/squashfs/squashfs.mk @@ -0,0 +1,30 @@ +SQUASHFS_VERSION=4.0 +SQUASHFS_SOURCE=squashfs$(SQUASHFS_VERSION).tar.gz +SQUASHFS_SITE=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/squashfs + +SQUASHFS_DEPENDENCIES = zlib +HOST_SQUASHFS_DEPENDENCIES = host-zlib + +define SQUASHFS_BUILD_CMDS + $(TARGET_MAKE_ENV) $(MAKE) \ + CC="$(TARGET_CC)" \ + CFLAGS="$(TARGET_CFLAGS)" \ + LDFLAGS="$(TARGET_LDFLAGS)" \ + -C $(@D)/squashfs-tools/ +endef + +define SQUASHFS_INSTALL_TARGET_CMDS + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/squashfs-tools/ INSTALL_DIR=$(TARGET_DIR)/usr/bin install +endef + +define HOST_SQUASHFS_BUILD_CMDS + $(HOST_MAKE_ENV) $(MAKE) -C $(@D)/squashfs-tools/ +endef + +define HOST_SQUASHFS_INSTALL_CMDS + $(HOST_MAKE_ENV) $(MAKE) -C $(@D)/squashfs-tools/ INSTALL_DIR=$(HOST_DIR)/usr/bin install +endef + +$(eval $(call GENTARGETS,package,squashfs)) +$(eval $(call GENTARGETS,package,squashfs,host)) + diff --git a/scripts/test/Config.in.test.buildall b/scripts/test/Config.in.test.buildall index b5bb0501f..1acb466df 100644 --- a/scripts/test/Config.in.test.buildall +++ b/scripts/test/Config.in.test.buildall @@ -29,7 +29,6 @@ config BR2_TARGET_TEST_PACKAGES select BR2_PACKAGE_DISTCC select BR2_PACKAGE_DMALLOC select BR2_PACKAGE_FAKEROOT - select BR2_HOST_FAKEROOT select BR2_PACKAGE_GETTEXT select BR2_PACKAGE_GETTEXT_STATIC select BR2_PACKAGE_LIBINTL diff --git a/target/Config.in b/target/Config.in index 4cae66cf7..5d5363538 100644 --- a/target/Config.in +++ b/target/Config.in @@ -1,47 +1,4 @@ -menu "Target filesystem options" - -config BR2_ROOTFS_PREFIX - string "Custom root fs prefix" - default "rootfs" - help - Add a custom string to the beginning of the root file system name. - -config BR2_ROOTFS_SUFFIX - string "Custom root fs suffix" - default "" - help - Add a custom string to the end of the root file system name. - -config BR2_ROOTFS_POST_BUILD_SCRIPT - string "Custom script to run before packing files" - default "" - help - Specify a script to be run after the build has finished and before - the BR2 starts packing the files into selected packages. - - This gives users the oportunity to do board-specific cleanups, - add-ons and the like, so the generated files can be used directly - without further processing. - - The script is called with the target directory name as first and - only argument. Make sure the exit code of that script is 0, - otherwise make will stop after calling it. - -comment "filesystem for target device" - -source "target/cramfs/Config.in" -source "target/cloop/Config.in" -source "target/ext2/Config.in" -source "target/jffs2/Config.in" -source "target/ubifs/Config.in" -source "target/squashfs/Config.in" -source "target/tar/Config.in" -source "target/cpio/Config.in" -source "target/iso9660/Config.in" -source "target/initramfs/Config.in" -source "target/romfs/Config.in" - -comment "bootloader for target device" +menu "Bootloaders" source "target/x86/grub/Config.in" #source "target/x86/grub2/Config.in" diff --git a/target/Makefile.in b/target/Makefile.in index df980b473..48396d5d8 100644 --- a/target/Makefile.in +++ b/target/Makefile.in @@ -62,7 +62,6 @@ ifeq ($(BR2_TARGET_UBOOT),y) include target/u-boot/Makefile.in endif -# and finally build the filesystems/tarballs include target/*/*.mk # kernel rules diff --git a/target/cloop/Makefile.in b/target/cloop/Makefile.in deleted file mode 100644 index 0afc58f87..000000000 --- a/target/cloop/Makefile.in +++ /dev/null @@ -1,3 +0,0 @@ -ifeq ($(BR2_TARGET_ROOTFS_CLOOP),y) -TARGETS+=clooproot -endif diff --git a/target/cloop/cloop.mk b/target/cloop/cloop.mk deleted file mode 100644 index 059dd6c4b..000000000 --- a/target/cloop/cloop.mk +++ /dev/null @@ -1,108 +0,0 @@ -############################################################# -# -# mkcloop to build to target cloop filesystems -# -############################################################# -CLOOP_VERSION=2.06 -CLOOP_DIR=$(BUILD_DIR)/cloop-$(CLOOP_VERSION) -CLOOP_SOURCE=cloop_$(CLOOP_VERSION)-2.tar.gz -CLOOP_SITE=http://debian-knoppix.alioth.debian.org/sources/ - -CLOOP_TARGET:=$(IMAGE).cloop -### Note: not used yet! ck -### $(DL_DIR)/$(CLOOP_PATCH1): -### $(call DOWNLOAD,$(CLOOP_PATCH1_URL),$(CLOOP_PATCH1)) - -$(DL_DIR)/$(CLOOP_SOURCE): - $(call DOWNLOAD,$(CLOOP_SITE),$(CLOOP_SOURCE)) - -$(CLOOP_DIR)/.unpacked: $(DL_DIR)/$(CLOOP_SOURCE) ### $(DL_DIR)/$(CLOOP_PATCH1) - $(ZCAT) $(DL_DIR)/$(CLOOP_SOURCE) | tar -C $(BUILD_DIR) -xvf - - touch $@ -### $(ZCAT) $(DL_DIR)/$(CLOOP_PATCH1) | patch -p1 -d $(CLOOP_DIR) -### toolchain/patch-kernel.sh $(CLOOP_DIR) target/cloop/ cloop\*.patch - -$(CLOOP_DIR)/create_compressed_fs: $(CLOOP_DIR)/.unpacked - $(MAKE) CFLAGS="-Wall -O2 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -DUSE_ERROR_SILENT" -C $(CLOOP_DIR) \ - APPSONLY=yes -j1 - -cloop: $(CLOOP_DIR)/create_compressed_fs - -cloop-source: $(DL_DIR)/$(CLOOP_SOURCE) - -cloop-clean: - -$(MAKE) -C $(CLOOP_DIR) clean - -cloop-dirclean: - rm -rf $(CLOOP_DIR) - -############################################################# -# -# Build the cloop.o kernel module for the HOST -# -############################################################# - -$(CLOOP_DIR)/cloop.o: $(CLOOP_DIR)/create_compressed_fs - $(MAKE) CFLAGS="-Wall -O2 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -DUSE_ERROR_SILENT" -C $(CLOOP_DIR) -j1 - -cloop-module: $(CLOOP_DIR)/cloop.o - -############################################################# -# -# Build the cloop root filesystem image -# -# Note: we need additionall host tools: -# required: -# mkisofs 2.01a34-unofficial-iconv from http://users.utu.fi/jahhein/mkisofs/ -# optional: -# symlinks: scan/change symbolic links - v1.2 - by Mark Lord -# from ftp://ftp.ibiblio.org/pub/Linux/utils/file/ -# -############################################################# - -### Note: target/default/device_table.txt is not yet supported! ck -# the quickfix is to use sudo to mount the previous created cramroot -check-tools: - - which symlinks && symlinks -r $(TARGET_DIR) - -$(IMAGE).cramfs: cramfsroot - -clooproot: cloop check-tools $(IMAGE).cramfs - ### $(CLOOP_DIR)/create_compressed_fs -q -D target/default/device_table.txt $(TARGET_DIR) $(CLOOP_TARGET) - ## mkisofs -r $(TARGET_DIR) | $(CLOOP_DIR)/create_compressed_fs - 65536 > $(CLOOP_TARGET) - sudo mkdir -p /mnt/compressed - sudo mount -o ro,loop -t cramfs $(IMAGE).cramfs /mnt/compressed - mkisofs -r /mnt/compressed | $(CLOOP_DIR)/create_compressed_fs - 65536 > $(CLOOP_TARGET) - - symlinks -r /mnt/compressed - sudo umount /mnt/compressed - @echo "Mounting a compressed image:" - @echo " sudo mkdir -p /mnt/compressed" - @echo " sudo /sbin/insmod cloop" - @echo " sudo /sbin/losetup /dev/cloop1 $(CLOOP_TARGET)" - @echo " sudo mount -o ro -t iso9660 /dev/cloop1 /mnt/compressed" - -clooproot-source: cloop-source - -clooproot-clean: - -$(MAKE) -C $(CLOOP_DIR) clean - -clooproot-dirclean: - rm -rf $(CLOOP_DIR) - -############################################################# -# symlinks -r /mnt/compressed -# dangling: /mnt/compressed/dev/log -> /tmp/log -# other_fs: /mnt/compressed/etc/mtab -> /proc/mounts -# other_fs: /mnt/compressed/var/lib/pcmcia -> /tmp -# other_fs: /mnt/compressed/var/lock -> /tmp -# other_fs: /mnt/compressed/var/log -> /tmp -# other_fs: /mnt/compressed/var/pcmcia -> /tmp -# other_fs: /mnt/compressed/var/run -> /tmp -# other_fs: /mnt/compressed/var/spool -> /tmp -# other_fs: /mnt/compressed/var/tmp -> /tmp -# -# ls -lrsS root_fs_*.* -# 1296 -rw-r--r-- 1 claus users 1325478 Mar 13 16:52 root_fs_powerpc.cloop -# 1448 -rw-r--r-- 1 claus users 1482752 Mar 13 16:52 root_fs_powerpc.cramfs -# 1840 -rw-r--r-- 1 claus users 1883408 Mar 13 13:14 root_fs_powerpc.jffs2 -############################################################# diff --git a/target/cpio/cpioroot.mk b/target/cpio/cpioroot.mk deleted file mode 100644 index 2197d1050..000000000 --- a/target/cpio/cpioroot.mk +++ /dev/null @@ -1,87 +0,0 @@ -############################################################# -# -# cpio to archive target filesystem -# -############################################################# - -CPIO_BASE:=$(IMAGE).cpio - -CPIO_ROOTFS_COMPRESSOR:= -CPIO_ROOTFS_COMPRESSOR_EXT:= -CPIO_ROOTFS_COMPRESSOR_PREREQ:= -ifeq ($(BR2_TARGET_ROOTFS_CPIO_GZIP),y) -CPIO_ROOTFS_COMPRESSOR:=gzip -9 -c -CPIO_ROOTFS_COMPRESSOR_EXT:=gz -#CPIO_ROOTFS_COMPRESSOR_PREREQ:= gzip-host -endif -ifeq ($(BR2_TARGET_ROOTFS_CPIO_BZIP2),y) -CPIO_ROOTFS_COMPRESSOR:=bzip2 -9 -c -CPIO_ROOTFS_COMPRESSOR_EXT:=bz2 -#CPIO_ROOTFS_COMPRESSOR_PREREQ:= bzip2-host -endif -ifeq ($(BR2_TARGET_ROOTFS_CPIO_LZMA),y) -CPIO_ROOTFS_COMPRESSOR:=lzma -9 -c -CPIO_ROOTFS_COMPRESSOR_EXT:=lzma -CPIO_ROOTFS_COMPRESSOR_PREREQ:= lzma-host -endif - -ifneq ($(CPIO_ROOTFS_COMPRESSOR),) -CPIO_TARGET := $(CPIO_BASE).$(CPIO_ROOTFS_COMPRESSOR_EXT) -else -CPIO_TARGET := $(CPIO_BASE) -endif - -ROOTFS_CPIO_COPYTO:=$(call qstrip,$(BR2_TARGET_ROOTFS_CPIO_COPYTO)) -# - -cpioroot-init: - rm -f $(TARGET_DIR)/init - ln -s sbin/init $(TARGET_DIR)/init - -$(CPIO_BASE): host-fakeroot makedevs cpioroot-init - # Use fakeroot to pretend all target binaries are owned by root - rm -f $(BUILD_DIR)/_fakeroot.$(notdir $(CPIO_BASE)) - touch $(BUILD_DIR)/.fakeroot.00000 - cat $(BUILD_DIR)/.fakeroot* > $(BUILD_DIR)/_fakeroot.$(notdir $(CPIO_BASE)) - echo "chown -R 0:0 $(TARGET_DIR)" >> $(BUILD_DIR)/_fakeroot.$(notdir $(CPIO_BASE)) -ifneq ($(TARGET_DEVICE_TABLE),) - # Use fakeroot to pretend to create all needed device nodes - echo "$(HOST_DIR)/usr/bin/makedevs -d $(TARGET_DEVICE_TABLE) $(TARGET_DIR)" \ - >> $(BUILD_DIR)/_fakeroot.$(notdir $(CPIO_BASE)) -endif - # Use fakeroot so tar believes the previous fakery - echo "cd $(TARGET_DIR) && find . | cpio --quiet -o -H newc > $(CPIO_BASE)" \ - >> $(BUILD_DIR)/_fakeroot.$(notdir $(CPIO_BASE)) - chmod a+x $(BUILD_DIR)/_fakeroot.$(notdir $(CPIO_BASE)) - $(HOST_DIR)/usr/bin/fakeroot -- $(BUILD_DIR)/_fakeroot.$(notdir $(CPIO_BASE)) - #-@rm -f $(BUILD_DIR)/_fakeroot.$(notdir $(CPIO_BASE)) -ifeq ($(CPIO_ROOTFS_COMPRESSOR),) -ifneq ($(ROOTFS_CPIO_COPYTO),) - $(Q)cp -f $(CPIO_BASE) $(ROOTFS_CPIO_COPYTO) -endif -endif - -ifneq ($(CPIO_ROOTFS_COMPRESSOR),) -$(CPIO_BASE).$(CPIO_ROOTFS_COMPRESSOR_EXT): $(CPIO_ROOTFS_COMPRESSOR_PREREQ) $(CPIO_BASE) - $(CPIO_ROOTFS_COMPRESSOR) $(CPIO_BASE) > $(CPIO_TARGET) -ifneq ($(ROOTFS_CPIO_COPYTO),) - $(Q)cp -f $(CPIO_BASE).$(CPIO_ROOTFS_COMPRESSOR_EXT) $(ROOTFS_CPIO_COPYTO).$(CPIO_ROOTFS_COMPRESSOR_EXT) -endif -endif - -cpioroot: $(CPIO_TARGET) - -cpioroot-source: - -cpioroot-clean: - -cpioroot-dirclean: - -############################################################# -# -# Toplevel Makefile options -# -############################################################# -ifeq ($(BR2_TARGET_ROOTFS_CPIO),y) -TARGETS+=cpioroot -endif diff --git a/target/cramfs/cramfs.mk b/target/cramfs/cramfs.mk deleted file mode 100644 index e6d63ed01..000000000 --- a/target/cramfs/cramfs.mk +++ /dev/null @@ -1,86 +0,0 @@ -############################################################# -# -# mkcramfs to build to target cramfs filesystems -# -############################################################# -CRAMFS_DIR=$(BUILD_DIR)/cramfs-1.1 -CRAMFS_SOURCE=cramfs-1.1.tar.gz -ifeq ($(call qstrip,$(BR2_SOURCEFORGE_MIRROR)),unc) -# UNC does not seem to have cramfs -CRAMFS_SITE=http://internap.dl.sourceforge.net/sourceforge/cramfs -else -CRAMFS_SITE=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/cramfs -endif - -$(DL_DIR)/$(CRAMFS_SOURCE): - $(call DOWNLOAD,$(CRAMFS_SITE),$(CRAMFS_SOURCE)) - -$(CRAMFS_DIR): $(DL_DIR)/$(CRAMFS_SOURCE) - $(ZCAT) $(DL_DIR)/$(CRAMFS_SOURCE) | tar -C $(BUILD_DIR) -xvf - - toolchain/patch-kernel.sh $(CRAMFS_DIR) target/cramfs/ cramfs\*.patch - -$(CRAMFS_DIR)/mkcramfs: $(CRAMFS_DIR) - $(MAKE) CFLAGS="$(HOST_CFLAGS) -Wall -O2 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64" LDFLAGS="$(HOST_LDFLAGS)" -C $(CRAMFS_DIR) - touch -c $@ - -cramfs: host-zlib $(CRAMFS_DIR)/mkcramfs - -cramfs-source: $(DL_DIR)/$(CRAMFS_SOURCE) - -cramfs-clean: - -$(MAKE) -C $(CRAMFS_DIR) clean - -cramfs-dirclean: - rm -rf $(CRAMFS_DIR) - -############################################################# -# -# Build the cramfs root filesystem image -# -############################################################# -ifeq ($(BR2_ENDIAN),"BIG") -CRAMFS_OPTS=-b -else -CRAMFS_OPTS=-l -endif - -ifneq ($(TARGET_DEVICE_TABLE),) -CRAMFS_OPTS += -D $(TARGET_DEVICE_TABLE) -endif - -CRAMFS_TARGET=$(IMAGE).cramfs - -cramfsroot: host-fakeroot makedevs cramfs - # Use fakeroot to pretend all target binaries are owned by root - rm -f $(BUILD_DIR)/_fakeroot.$(notdir $(CRAMFS_TARGET)) - touch $(BUILD_DIR)/.fakeroot.00000 - cat $(BUILD_DIR)/.fakeroot* > $(BUILD_DIR)/_fakeroot.$(notdir $(CRAMFS_TARGET)) - echo "chown -R 0:0 $(TARGET_DIR)" >> $(BUILD_DIR)/_fakeroot.$(notdir $(CRAMFS_TARGET)) -ifneq ($(TARGET_DEVICE_TABLE),) - # Use fakeroot to pretend to create all needed device nodes - echo "$(HOST_DIR)/usr/bin/makedevs -d $(TARGET_DEVICE_TABLE) $(TARGET_DIR)" \ - >> $(BUILD_DIR)/_fakeroot.$(notdir $(CRAMFS_TARGET)) -endif - # Use fakeroot so mkcramfs believes the previous fakery - echo "$(CRAMFS_DIR)/mkcramfs -q $(CRAMFS_OPTS) " \ - "$(TARGET_DIR) $(CRAMFS_TARGET)" >> $(BUILD_DIR)/_fakeroot.$(notdir $(CRAMFS_TARGET)) - chmod a+x $(BUILD_DIR)/_fakeroot.$(notdir $(CRAMFS_TARGET)) - $(HOST_DIR)/usr/bin/fakeroot -- $(BUILD_DIR)/_fakeroot.$(notdir $(CRAMFS_TARGET)) - -@rm -f $(BUILD_DIR)/_fakeroot.$(notdir $(CRAMFS_TARGET)) - -cramfsroot-source: cramfs-source - -cramfsroot-clean: - -$(MAKE) -C $(CRAMFS_DIR) clean - -cramfsroot-dirclean: - rm -rf $(CRAMFS_DIR) - -############################################################# -# -# Toplevel Makefile options -# -############################################################# -ifeq ($(BR2_TARGET_ROOTFS_CRAMFS),y) -TARGETS+=cramfsroot -endif diff --git a/target/ext2/ext2root.mk b/target/ext2/ext2root.mk deleted file mode 100644 index 622b29329..000000000 --- a/target/ext2/ext2root.mk +++ /dev/null @@ -1,146 +0,0 @@ -############################################################# -# -# genext2fs to build to target ext2 filesystems -# -############################################################# -GENEXT2_VERSION=1.4 -GENEXT2_DIR=$(BUILD_DIR)/genext2fs-$(GENEXT2_VERSION) -GENEXT2_SOURCE=genext2fs-$(GENEXT2_VERSION).tar.gz -GENEXT2_SITE:=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/genext2fs - -$(DL_DIR)/$(GENEXT2_SOURCE): - $(call DOWNLOAD,$(GENEXT2_SITE),$(GENEXT2_SOURCE)) - -$(GENEXT2_DIR)/.unpacked: $(DL_DIR)/$(GENEXT2_SOURCE) - $(ZCAT) $(DL_DIR)/$(GENEXT2_SOURCE) | tar -C $(BUILD_DIR) -xvf - - toolchain/patch-kernel.sh $(GENEXT2_DIR) target/ext2/ genext2fs\*.patch - touch $@ - -$(GENEXT2_DIR)/.configured: $(GENEXT2_DIR)/.unpacked - chmod a+x $(GENEXT2_DIR)/configure - (cd $(GENEXT2_DIR); rm -rf config.cache; \ - ./configure $(QUIET) \ - CC="$(HOSTCC)" \ - --prefix=$(STAGING_DIR) \ - ) - touch $@ - -$(GENEXT2_DIR)/genext2fs: $(GENEXT2_DIR)/.configured - $(MAKE) CFLAGS="-Wall -O2 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE \ - -D_FILE_OFFSET_BITS=64" -C $(GENEXT2_DIR) - touch -c $@ - -genext2fs: $(GENEXT2_DIR)/genext2fs - - - -############################################################# -# -# Build the ext2 root filesystem image -# -############################################################# - -EXT2_OPTS := - -ifeq ($(BR2_TARGET_ROOTFS_EXT2_SQUASH),y) -EXT2_OPTS += -U -endif - -ifneq ($(strip $(BR2_TARGET_ROOTFS_EXT2_BLOCKS)),0) -EXT2_OPTS += -b $(BR2_TARGET_ROOTFS_EXT2_BLOCKS) -endif - -ifneq ($(strip $(BR2_TARGET_ROOTFS_EXT2_INODES)),0) -EXT2_OPTS += -N $(BR2_TARGET_ROOTFS_EXT2_INODES) -endif - -ifneq ($(strip $(BR2_TARGET_ROOTFS_EXT2_RESBLKS)),) -EXT2_OPTS += -m $(BR2_TARGET_ROOTFS_EXT2_RESBLKS) -endif - -EXT2_BASE := $(call qstrip,$(BR2_TARGET_ROOTFS_EXT2_OUTPUT)) - -EXT2_ROOTFS_COMPRESSOR:= -EXT2_ROOTFS_COMPRESSOR_EXT:= -EXT2_ROOTFS_COMPRESSOR_PREREQ:= -ifeq ($(BR2_TARGET_ROOTFS_EXT2_GZIP),y) -EXT2_ROOTFS_COMPRESSOR:=gzip -9 -c -EXT2_ROOTFS_COMPRESSOR_EXT:=gz -#EXT2_ROOTFS_COMPRESSOR_PREREQ:= gzip-host -endif -ifeq ($(BR2_TARGET_ROOTFS_EXT2_BZIP2),y) -EXT2_ROOTFS_COMPRESSOR:=bzip2 -9 -c -EXT2_ROOTFS_COMPRESSOR_EXT:=bz2 -#EXT2_ROOTFS_COMPRESSOR_PREREQ:= bzip2-host -endif -ifeq ($(BR2_TARGET_ROOTFS_EXT2_LZMA),y) -EXT2_ROOTFS_COMPRESSOR:=lzma -9 -c -EXT2_ROOTFS_COMPRESSOR_EXT:=lzma -EXT2_ROOTFS_COMPRESSOR_PREREQ:= lzma-host -endif - -ifneq ($(EXT2_ROOTFS_COMPRESSOR),) -EXT2_TARGET := $(EXT2_BASE).$(EXT2_ROOTFS_COMPRESSOR_EXT) -else -EXT2_TARGET := $(EXT2_BASE) -endif - -$(EXT2_BASE): host-fakeroot makedevs genext2fs - # Use fakeroot to pretend all target binaries are owned by root - rm -f $(BUILD_DIR)/_fakeroot.$(notdir $(EXT2_TARGET)) - touch $(BUILD_DIR)/.fakeroot.00000 - cat $(BUILD_DIR)/.fakeroot* > $(BUILD_DIR)/_fakeroot.$(notdir $(EXT2_TARGET)) - echo "chown -R 0:0 $(TARGET_DIR)" >> $(BUILD_DIR)/_fakeroot.$(notdir $(EXT2_TARGET)) -ifneq ($(TARGET_DEVICE_TABLE),) - # Use fakeroot to pretend to create all needed device nodes - echo "$(HOST_DIR)/usr/bin/makedevs -d $(TARGET_DEVICE_TABLE) $(TARGET_DIR)" \ - >> $(BUILD_DIR)/_fakeroot.$(notdir $(EXT2_TARGET)) -endif - # Use fakeroot so genext2fs believes the previous fakery -ifeq ($(strip $(BR2_TARGET_ROOTFS_EXT2_BLOCKS)),0) - GENEXT2_REALSIZE=`LC_ALL=C du -s -c -k $(TARGET_DIR) | grep total | sed -e "s/total//"`; \ - GENEXT2_ADDTOROOTSIZE=`if [ $$GENEXT2_REALSIZE -ge 20000 ]; then echo 16384; else echo 2400; fi`; \ - GENEXT2_SIZE=`expr $$GENEXT2_REALSIZE + $$GENEXT2_ADDTOROOTSIZE`; \ - GENEXT2_ADDTOINODESIZE=`find $(TARGET_DIR) | wc -l`; \ - GENEXT2_INODES=`expr $$GENEXT2_ADDTOINODESIZE + 400`; \ - set -x; \ - echo "$(GENEXT2_DIR)/genext2fs -b $$GENEXT2_SIZE " \ - "-N $$GENEXT2_INODES -d $(TARGET_DIR) " \ - "$(EXT2_OPTS) $(EXT2_BASE)" >> $(BUILD_DIR)/_fakeroot.$(notdir $(EXT2_TARGET)) -else - echo "$(GENEXT2_DIR)/genext2fs -d $(TARGET_DIR) " \ - "$(EXT2_OPTS) $(EXT2_BASE)" >> $(BUILD_DIR)/_fakeroot.$(notdir $(EXT2_TARGET)) -endif - chmod a+x $(BUILD_DIR)/_fakeroot.$(notdir $(EXT2_TARGET)) - $(HOST_DIR)/usr/bin/fakeroot -- $(BUILD_DIR)/_fakeroot.$(notdir $(EXT2_TARGET)) - -@rm -f $(BUILD_DIR)/_fakeroot.$(notdir $(EXT2_TARGET)) - -ifneq ($(EXT2_ROOTFS_COMPRESSOR),) -$(EXT2_BASE).$(EXT2_ROOTFS_COMPRESSOR_EXT): $(EXT2_ROOTFS_COMPRESSOR_PREREQ) $(EXT2_BASE) - $(EXT2_ROOTFS_COMPRESSOR) $(EXT2_BASE) > $(EXT2_TARGET) -endif - -EXT2_COPYTO := $(call qstrip,$(BR2_TARGET_ROOTFS_EXT2_COPYTO)) - -ext2root: $(EXT2_TARGET) - @ls -l $(EXT2_TARGET) -ifneq ($(EXT2_COPYTO),) - @cp -f $(EXT2_TARGET) $(EXT2_COPYTO) -endif - -ext2root-source: $(DL_DIR)/$(GENEXT2_SOURCE) - -ext2root-clean: - -$(MAKE) -C $(GENEXT2_DIR) clean - -ext2root-dirclean: - rm -rf $(GENEXT2_DIR) - -############################################################# -# -# Toplevel Makefile options -# -############################################################# -ifeq ($(BR2_TARGET_ROOTFS_EXT2),y) -TARGETS+=ext2root -endif diff --git a/target/initramfs/initramfs.mk b/target/initramfs/initramfs.mk deleted file mode 100644 index 0030278c5..000000000 --- a/target/initramfs/initramfs.mk +++ /dev/null @@ -1,43 +0,0 @@ -############################################################# -# -# Make a initramfs_list file to be used by gen_init_cpio -# gen_init_cpio is part of the 2.6 linux kernels to build an -# initial ramdisk filesystem based on cpio -# -############################################################# - -ifeq ($(BR2_TARGET_ROOTFS_INITRAMFS),y) -INITRAMFS_TARGET:=$(IMAGE).initramfs_list -else -INITRAMFS_TARGET:= #nothing -endif - -TARGETS+=$(INITRAMFS_TARGET) - -$(INITRAMFS_TARGET) initramfs: host-fakeroot makedevs - rm -f $(TARGET_DIR)/init - ln -s sbin/init $(TARGET_DIR)/init - # Use fakeroot to pretend all target binaries are owned by root - rm -f $(BUILD_DIR)/_fakeroot.$(notdir $(TAR_TARGET)) - touch $(BUILD_DIR)/.fakeroot.00000 - cat $(BUILD_DIR)/.fakeroot* > $(BUILD_DIR)/_fakeroot.$(notdir $(TAR_TARGET)) - echo "chown -R 0:0 $(TARGET_DIR)" >> $(BUILD_DIR)/_fakeroot.$(notdir $(TAR_TARGET)) - # Use fakeroot to pretend to create all needed device nodes - echo "$(HOST_DIR)/usr/bin/makedevs -d $(TARGET_DEVICE_TABLE) $(TARGET_DIR)" \ - >> $(BUILD_DIR)/_fakeroot.$(notdir $(TAR_TARGET)) - # Use fakeroot so gen_initramfs_list.sh believes the previous fakery - echo "$(SHELL) target/initramfs/gen_initramfs_list.sh -u 0 -g 0 $(TARGET_DIR) > $(INITRAMFS_TARGET)" \ - >> $(BUILD_DIR)/_fakeroot.$(notdir $(TAR_TARGET)) - chmod a+x $(BUILD_DIR)/_fakeroot.$(notdir $(TAR_TARGET)) - $(HOST_DIR)/usr/bin/fakeroot -- $(BUILD_DIR)/_fakeroot.$(notdir $(TAR_TARGET)) - -rm -f $(BUILD_DIR)/_fakeroot.$(notdir $(TAR_TARGET)) - -initramfs-source: - -initramfs-clean: -ifeq ($(BR2_TARGET_ROOTFS_INITRAMFS),y) - -rm -f $(INITRAMFS_TARGET) -endif -initramfs-dirclean: - - diff --git a/target/iso9660/iso9660.mk b/target/iso9660/iso9660.mk deleted file mode 100644 index 9571e4769..000000000 --- a/target/iso9660/iso9660.mk +++ /dev/null @@ -1,95 +0,0 @@ -############################################################# -# -# mkisofs to build to target iso9660 filesystems -# -############################################################# -MKISOFS_SOURCE:=cdrtools-2.01.tar.bz2 -MKISOFS_CAT:=$(BZCAT) -MKISOFS_SITE:=ftp://ftp.berlios.de/pub/cdrecord/ -MKISOFS_DIR:=$(BUILD_DIR)/cdrtools-2.01 -MKISOFS_TARGET=$(MKISOFS_DIR)/mkisofs/OBJ/$(HOST_ARCH)-linux-cc/mkisofs - -hest: - @echo ARCH=$(BR2_ARCH) HOST_ARCH=$(HOST_ARCH) -$(DL_DIR)/$(MKISOFS_SOURCE): - $(call DOWNLOAD,$(MKISOFS_SITE),$(MKISOFS_SOURCE)) - -mkisofs-source: $(DL_DIR)/$(MKISOFS_SOURCE) - -$(MKISOFS_DIR)/.unpacked: $(DL_DIR)/$(MKISOFS_SOURCE) - $(MKISOFS_CAT) $(DL_DIR)/$(MKISOFS_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - - toolchain/patch-kernel.sh $(MKISOFS_DIR) target/iso9660/ \*.patch - touch $@ - -$(MKISOFS_DIR)/.configured: $(MKISOFS_DIR)/.unpacked - (cd $(MKISOFS_DIR); rm -rf config.cache; \ - ); - touch $@ - -$(MKISOFS_TARGET): $(MKISOFS_DIR)/.configured - $(MAKE) -C $(MKISOFS_DIR) - touch -c $(MKISOFS_DIR)/mkisofs - -mkisofs: $(MKISOFS_TARGET) - -mkisofs-clean: - -$(MAKE) -C $(MKISOFS_DIR) clean - -mkisofs-dirclean: - rm -rf $(MKISOFS_DIR) - - -############################################################# -# -# Build the iso96600 root filesystem image -# -############################################################# - -ISO9660_TARGET_DIR=$(BUILD_DIR)/iso9660 -ISO9660_TARGET:=$(call qstrip,$(BR2_TARGET_ROOTFS_ISO9660_OUTPUT)) -ISO9660_BOOT_MENU:=$(call qstrip,$(BR2_TARGET_ROOTFS_ISO9660_BOOT_MENU)) -ISO9660_OPTS:= - -ifeq ($(BR2_TARGET_ROOTFS_ISO9660_SQUASH),y) -ISO9660_OPTS+=-U -endif - -$(ISO9660_TARGET): host-fakeroot $(LINUX_KERNEL) $(EXT2_TARGET) grub mkisofs - mkdir -p $(ISO9660_TARGET_DIR) - mkdir -p $(ISO9660_TARGET_DIR)/boot/grub - cp $(GRUB_DIR)/stage2/stage2_eltorito $(ISO9660_TARGET_DIR)/boot/grub/ - cp $(ISO9660_BOOT_MENU) $(ISO9660_TARGET_DIR)/boot/grub/menu.lst - cp $(LINUX_KERNEL) $(ISO9660_TARGET_DIR)/kernel - cp $(EXT2_TARGET) $(ISO9660_TARGET_DIR)/initrd - # Use fakeroot to pretend all target binaries are owned by root - rm -f $(BUILD_DIR)/_fakeroot.$(notdir $(ISO9660_TARGET)) - touch $(BUILD_DIR)/.fakeroot.00000 - cat $(BUILD_DIR)/.fakeroot* > $(BUILD_DIR)/_fakeroot.$(notdir $(ISO9660_TARGET)) - echo "chown -R 0:0 $(ISO9660_TARGET_DIR)" >> $(BUILD_DIR)/_fakeroot.$(notdir $(ISO9660_TARGET)) - # Use fakeroot so mkisofs believes the previous fakery - echo "$(MKISOFS_TARGET) -R -b boot/grub/stage2_eltorito -no-emul-boot " \ - "-boot-load-size 4 -boot-info-table -o $(ISO9660_TARGET) $(ISO9660_TARGET_DIR)" \ - >> $(BUILD_DIR)/_fakeroot.$(notdir $(ISO9660_TARGET)) - chmod a+x $(BUILD_DIR)/_fakeroot.$(notdir $(ISO9660_TARGET)) - $(HOST_DIR)/usr/bin/fakeroot -- $(BUILD_DIR)/_fakeroot.$(notdir $(ISO9660_TARGET)) - -@rm -f $(BUILD_DIR)/_fakeroot.$(notdir $(ISO9660_TARGET)) - -iso9660root: $(ISO9660_TARGET) - echo $(ISO9660_TARGET) - @ls -l $(ISO9660_TARGET) - -iso9660root-source: mkisofs-source - -iso9660root-clean: mkisofs-clean - -iso9660root-dirclean: mkisofs-dirclean - rm -rf $(ISO9660_DIR) - -############################################################# -# -# Toplevel Makefile options -# -############################################################# -ifeq ($(BR2_TARGET_ROOTFS_ISO9660),y) -TARGETS+=iso9660root -endif diff --git a/target/jffs2/jffs2root.mk b/target/jffs2/jffs2root.mk deleted file mode 100644 index 7d31417ee..000000000 --- a/target/jffs2/jffs2root.mk +++ /dev/null @@ -1,99 +0,0 @@ -############################################################# -# -# Build the jffs2 root filesystem image -# -############################################################# - -JFFS2_OPTS := -e $(BR2_TARGET_ROOTFS_JFFS2_EBSIZE) -SUMTOOL_OPTS := $(JFFS2_OPTS) - -ifeq ($(BR2_TARGET_ROOTFS_JFFS2_PAD),y) -ifneq ($(strip $(BR2_TARGET_ROOTFS_JFFS2_PADSIZE)),0x0) -JFFS2_OPTS += --pad=$(strip $(BR2_TARGET_ROOTFS_JFFS2_PADSIZE)) -else -JFFS2_OPTS += -p -endif -SUMTOOL_OPTS += -p -endif - -ifeq ($(BR2_TARGET_ROOTFS_JFFS2_LE),y) -JFFS2_OPTS += -l -SUMTOOL_OPTS += -l -endif - -ifeq ($(BR2_TARGET_ROOTFS_JFFS2_BE),y) -JFFS2_OPTS += -b -SUMTOOL_OPTS += -b -endif - -JFFS2_OPTS += -s $(BR2_TARGET_ROOTFS_JFFS2_PAGESIZE) -ifeq ($(BR2_TARGET_ROOTFS_JFFS2_NOCLEANMARKER),y) -JFFS2_OPTS += -n -SUMTOOL_OPTS += -n -endif - -JFFS2_TARGET := $(call qstrip,$(BR2_TARGET_ROOTFS_JFFS2_OUTPUT)) -ifneq ($(TARGET_DEVICE_TABLE),) -JFFS2_OPTS += -D $(TARGET_DEVICE_TABLE) -endif - - -# -# mtd-host is a dependency which builds a local copy of mkfs.jffs2 if it is needed. -# the actual build is done from package/mtd/mtd.mk and it sets the -# value of MKFS_JFFS2 to either the previously installed copy or the one -# just built. -# -$(JFFS2_TARGET): host-fakeroot makedevs mtd-host - # Use fakeroot to pretend all target binaries are owned by root - rm -f $(BUILD_DIR)/_fakeroot.$(notdir $(JFFS2_TARGET)) - touch $(BUILD_DIR)/.fakeroot.00000 - cat $(BUILD_DIR)/.fakeroot* > $(BUILD_DIR)/_fakeroot.$(notdir $(JFFS2_TARGET)) - echo "chown -R 0:0 $(TARGET_DIR)" >> $(BUILD_DIR)/_fakeroot.$(notdir $(JFFS2_TARGET)) -ifneq ($(TARGET_DEVICE_TABLE),) - # Use fakeroot to pretend to create all needed device nodes - echo "$(HOST_DIR)/usr/bin/makedevs -d $(TARGET_DEVICE_TABLE) $(TARGET_DIR)" \ - >> $(BUILD_DIR)/_fakeroot.$(notdir $(JFFS2_TARGET)) -endif - # Use fakeroot so mkfs.jffs2 believes the previous fakery -ifneq ($(BR2_TARGET_ROOTFS_JFFS2_SUMMARY),) - echo "$(MKFS_JFFS2) $(JFFS2_OPTS) -d $(TARGET_DIR) -o $(JFFS2_TARGET).nosummary && " \ - "$(SUMTOOL) $(SUMTOOL_OPTS) -i $(JFFS2_TARGET).nosummary -o $(JFFS2_TARGET) && " \ - "rm $(JFFS2_TARGET).nosummary" \ - >> $(BUILD_DIR)/_fakeroot.$(notdir $(JFFS2_TARGET)) -else - echo "$(MKFS_JFFS2) $(JFFS2_OPTS) -d $(TARGET_DIR) -o $(JFFS2_TARGET)" \ - >> $(BUILD_DIR)/_fakeroot.$(notdir $(JFFS2_TARGET)) -endif - chmod a+x $(BUILD_DIR)/_fakeroot.$(notdir $(JFFS2_TARGET)) - $(HOST_DIR)/usr/bin/fakeroot -- $(BUILD_DIR)/_fakeroot.$(notdir $(JFFS2_TARGET)) - -@rm -f $(BUILD_DIR)/_fakeroot.$(notdir $(JFFS2_TARGET)) - @ls -l $(JFFS2_TARGET) -ifeq ($(BR2_JFFS2_TARGET_SREC),y) - $(TARGET_CROSS)objcopy -I binary -O srec --adjust-vma 0xa1000000 $(JFFS2_TARGET) $(JFFS2_TARGET).srec - @ls -l $(JFFS2_TARGET).srec -endif - -JFFS2_COPYTO := $(call qstrip,$(BR2_TARGET_ROOTFS_JFFS2_COPYTO)) - -jffs2root: $(JFFS2_TARGET) -ifneq ($(JFFS2_COPYTO),) - @cp -f $(JFFS2_TARGET) $(JFFS2_COPYTO) -endif - -jffs2root-source: mtd-host-source - -jffs2root-clean: mtd-host-clean - -rm -f $(JFFS2_TARGET) - -jffs2root-dirclean: mtd-host-dirclean - -rm -f $(JFFS2_TARGET) - -############################################################# -# -# Toplevel Makefile options -# -############################################################# -ifeq ($(BR2_TARGET_ROOTFS_JFFS2),y) -TARGETS+=jffs2root -endif diff --git a/target/romfs/romfs.mk b/target/romfs/romfs.mk deleted file mode 100644 index 6e7fbeedd..000000000 --- a/target/romfs/romfs.mk +++ /dev/null @@ -1,71 +0,0 @@ -############################################################# -# -# genromfs to build to target romfs filesystems -# -############################################################# -ROMFS_VERSION=0.5.2 -ROMFS_DIR=$(BUILD_DIR)/genromfs-$(ROMFS_VERSION) -ROMFS_SOURCE=genromfs-$(ROMFS_VERSION).tar.gz -ROMFS_SITE=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/romfs - -$(DL_DIR)/$(ROMFS_SOURCE): - $(call DOWNLOAD,$(ROMFS_SITE),$(ROMFS_SOURCE)) - -$(ROMFS_DIR): $(DL_DIR)/$(ROMFS_SOURCE) - $(ZCAT) $(DL_DIR)/$(ROMFS_SOURCE) | tar -C $(BUILD_DIR) -xvf - - -$(ROMFS_DIR)/genromfs: $(ROMFS_DIR) - $(MAKE) -C $(ROMFS_DIR) - touch -c $@ - -romfs: $(ROMFS_DIR)/genromfs - -romfs-source: $(DL_DIR)/$(ROMFS_SOURCE) - -romfs-clean: - -$(MAKE) -C $(ROMFS_DIR) clean - -romfs-dirclean: - rm -rf $(ROMFS_DIR) - -############################################################# -# -# Build the romfs root filesystem image -# -############################################################# - -ROMFS_TARGET=$(IMAGE).romfs - -romfsroot: host-fakeroot makedevs romfs - # Use fakeroot to pretend all target binaries are owned by root - rm -f $(BUILD_DIR)/_fakeroot.$(notdir $(ROMFS_TARGET)) - touch $(BUILD_DIR)/.fakeroot.00000 - cat $(BUILD_DIR)/.fakeroot* > $(BUILD_DIR)/_fakeroot.$(notdir $(ROMFS_TARGET)) - echo "chown -R 0:0 $(TARGET_DIR)" >> $(BUILD_DIR)/_fakeroot.$(notdir $(ROMFS_TARGET)) -ifneq ($(TARGET_DEVICE_TABLE),) - # Use fakeroot to pretend to create all needed device nodes - echo "$(HOST_DIR)/usr/bin/makedevs -d $(TARGET_DEVICE_TABLE) $(TARGET_DIR)" \ - >> $(BUILD_DIR)/_fakeroot.$(notdir $(ROMFS_TARGET)) -endif - # Use fakeroot so genromfs believes the previous fakery - echo "$(ROMFS_DIR)/genromfs -d $(TARGET_DIR) -f $(ROMFS_TARGET)" >> $(BUILD_DIR)/_fakeroot.$(notdir $(ROMFS_TARGET)) - chmod a+x $(BUILD_DIR)/_fakeroot.$(notdir $(ROMFS_TARGET)) - $(HOST_DIR)/usr/bin/fakeroot -- $(BUILD_DIR)/_fakeroot.$(notdir $(ROMFS_TARGET)) - -@rm -f $(BUILD_DIR)/_fakeroot.$(notdir $(ROMFS_TARGET)) - -romfsroot-source: romfs-source - -romfsroot-clean: - -$(MAKE) -C $(ROMFS_DIR) clean - -romfsroot-dirclean: - rm -rf $(ROMFS_DIR) - -############################################################# -# -# Toplevel Makefile options -# -############################################################# -ifeq ($(BR2_TARGET_ROOTFS_ROMFS),y) -TARGETS+=romfsroot -endif diff --git a/target/squashfs/Config.in b/target/squashfs/Config.in deleted file mode 100644 index 9259ba350..000000000 --- a/target/squashfs/Config.in +++ /dev/null @@ -1,32 +0,0 @@ -config BR2_TARGET_ROOTFS_SQUASHFS - bool "squashfs root filesystem" - select BR2_HOST_FAKEROOT - help - Build a squashfs root filesystem - -choice - prompt "Squashfs version" - default BR2_TARGET_ROOTFS_SQUASHFS_4 - depends on BR2_TARGET_ROOTFS_SQUASHFS - help - Select squashfs version - This must match what your kernel - supports. Select 3.x if you use the legacy 3.x kernel - patches (pre 2.6.29), and 4.x otherwise. - -config BR2_TARGET_ROOTFS_SQUASHFS_3 - depends on BR2_DEPRECATED || BR2_RECENT - bool "3.x" - help - Select this if you use the legacy 3.x kernel patches (pre 2.6.29) - -config BR2_TARGET_ROOTFS_SQUASHFS_4 - bool "4.x" - help - Select this if you use the squashfs version in mainline (from 2.6.29) - -endchoice - -config BR2_TARGET_ROOTFS_SQUASHFS_VERSION - string - default "3.4" if BR2_TARGET_ROOTFS_SQUASHFS_3 - default "4.0" if BR2_TARGET_ROOTFS_SQUASHFS_4 diff --git a/target/squashfs/squashfs-3.4-build-system-fix.patch b/target/squashfs/squashfs-3.4-build-system-fix.patch deleted file mode 100644 index 5b86b008a..000000000 --- a/target/squashfs/squashfs-3.4-build-system-fix.patch +++ /dev/null @@ -1,28 +0,0 @@ -[PATCH]: squashfs-tools: Handle user supplied CFLAGS/LDFLAGS - -Properly handle make CFLAGS=.. LDFLAGS=.. - -Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk> ---- - squashfs-tools/Makefile | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -Index: squashfs3.4/squashfs-tools/Makefile -=================================================================== ---- squashfs3.4.orig/squashfs-tools/Makefile -+++ squashfs3.4/squashfs-tools/Makefile -@@ -2,12 +2,12 @@ INSTALL_DIR = /usr/local/bin - - INCLUDEDIR = . - --CFLAGS := -I$(INCLUDEDIR) -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE -O2 -+override CFLAGS += -I$(INCLUDEDIR) -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE -O2 - - all: mksquashfs unsquashfs - - mksquashfs: mksquashfs.o read_fs.o sort.o -- $(CC) mksquashfs.o read_fs.o sort.o -lz -lpthread -lm -o $@ -+ $(CC) $(LDFLAGS) mksquashfs.o read_fs.o sort.o -lz -lpthread -lm -o $@ - - mksquashfs.o: mksquashfs.c squashfs_fs.h mksquashfs.h global.h sort.h - diff --git a/target/squashfs/squashfsroot.mk b/target/squashfs/squashfsroot.mk deleted file mode 100644 index 63adc5c36..000000000 --- a/target/squashfs/squashfsroot.mk +++ /dev/null @@ -1,85 +0,0 @@ -############################################################# -# -# mksquashfs to build to target squashfs filesystems -# -############################################################# -SQUASHFS_VERSION:=$(call qstrip,$(BR2_TARGET_ROOTFS_SQUASHFS_VERSION)) -SQUASHFS_DIR:=$(BUILD_DIR)/squashfs$(SQUASHFS_VERSION) -SQUASHFS_SOURCE:=squashfs$(SQUASHFS_VERSION).tar.gz -SQUASHFS_SITE:=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/squashfs -SQUASHFS_CAT:=$(ZCAT) - -$(DL_DIR)/$(SQUASHFS_SOURCE): - $(call DOWNLOAD,$(SQUASHFS_SITE),$(SQUASHFS_SOURCE)) - -$(SQUASHFS_DIR)/.unpacked: $(DL_DIR)/$(SQUASHFS_SOURCE) #$(SQUASHFS_PATCH) - $(SQUASHFS_CAT) $(DL_DIR)/$(SQUASHFS_SOURCE) | tar -C $(BUILD_DIR) -xvf - - toolchain/patch-kernel.sh $(SQUASHFS_DIR) target/squashfs/ squashfs-$(SQUASHFS_VERSION)-\*.patch - touch $@ - -$(SQUASHFS_DIR)/squashfs-tools/mksquashfs: $(SQUASHFS_DIR)/.unpacked - $(MAKE) CFLAGS="$(HOST_CFLAGS)" LDFLAGS="$(HOST_LDFLAGS)" -C $(SQUASHFS_DIR)/squashfs-tools - -squashfs: host-zlib $(SQUASHFS_DIR)/squashfs-tools/mksquashfs - -squashfs-source: $(DL_DIR)/$(SQUASHFS_SOURCE) - -squashfs-clean: - -$(MAKE) -C $(SQUASHFS_DIR)/squashfs-tools clean - -squashfs-dirclean: - rm -rf $(SQUASHFS_DIR) - -############################################################# -# -# Build the squashfs root filesystem image -# -############################################################# -ifeq ($(BR2_TARGET_ROOTFS_SQUASHFS_3),y) -# 4.x is always little endian -ifeq ($(BR2_ENDIAN),"BIG") -SQUASHFS_ENDIANNESS=-be -else -SQUASHFS_ENDIANNESS=-le -endif -endif - -SQUASHFS_TARGET:=$(IMAGE).squashfs - -squashfsroot: host-fakeroot makedevs squashfs - # Use fakeroot to pretend all target binaries are owned by root - rm -f $(BUILD_DIR)/_fakeroot.$(notdir $(SQUASHFS_TARGET)) - touch $(BUILD_DIR)/.fakeroot.00000 - cat $(BUILD_DIR)/.fakeroot* > $(BUILD_DIR)/_fakeroot.$(notdir $(SQUASHFS_TARGET)) - echo "chown -R 0:0 $(TARGET_DIR)" >> $(BUILD_DIR)/_fakeroot.$(notdir $(SQUASHFS_TARGET)) -ifneq ($(TARGET_DEVICE_TABLE),) - # Use fakeroot to pretend to create all needed device nodes - echo "$(HOST_DIR)/usr/bin/makedevs -d $(TARGET_DEVICE_TABLE) $(TARGET_DIR)" \ - >> $(BUILD_DIR)/_fakeroot.$(notdir $(SQUASHFS_TARGET)) -endif - # Use fakeroot so mksquashfs believes the previous fakery - echo "$(SQUASHFS_DIR)/squashfs-tools/mksquashfs " \ - "$(TARGET_DIR) $(SQUASHFS_TARGET) " \ - "-noappend $(SQUASHFS_ENDIANNESS)" \ - >> $(BUILD_DIR)/_fakeroot.$(notdir $(SQUASHFS_TARGET)) - chmod a+x $(BUILD_DIR)/_fakeroot.$(notdir $(SQUASHFS_TARGET)) - $(HOST_DIR)/usr/bin/fakeroot -- $(BUILD_DIR)/_fakeroot.$(notdir $(SQUASHFS_TARGET)) - chmod 0644 $(SQUASHFS_TARGET) - -@rm -f $(BUILD_DIR)/_fakeroot.$(notdir $(SQUASHFS_TARGET)) - -squashfsroot-source: squashfs-source - -squashfsroot-clean: - -$(MAKE) -C $(SQUASHFS_DIR) clean - -squashfsroot-dirclean: - rm -rf $(SQUASHFS_DIR) - -############################################################# -# -# Toplevel Makefile options -# -############################################################# -ifeq ($(BR2_TARGET_ROOTFS_SQUASHFS),y) -TARGETS+=squashfsroot -endif diff --git a/target/tar/tarroot.mk b/target/tar/tarroot.mk deleted file mode 100644 index a7e95df98..000000000 --- a/target/tar/tarroot.mk +++ /dev/null @@ -1,64 +0,0 @@ -############################################################# -# -# tar to archive target filesystem -# -############################################################# - -TAR_OPTS:=$(BR2_TARGET_ROOTFS_TAR_OPTIONS) -TAR_TARGET:=$(IMAGE).tar - -TAR_COMPRESSOR:= -TAR_COMPRESSOR_EXT:=.none -ifeq ($(BR2_TARGET_ROOTFS_TAR_GZIP),y) -TAR_COMPRESSOR:=gzip -9 -c -TAR_COMPRESSOR_EXT:=gz -endif -ifeq ($(BR2_TARGET_ROOTFS_TAR_BZIP2),y) -TAR_COMPRESSOR:=bzip2 -9 -c -TAR_COMPRESSOR_EXT:=bz2 -endif -ifeq ($(BR2_TARGET_ROOTFS_TAR_LZMA),y) -TAR_COMPRESSOR:=lzma -9 -c -TAR_COMPRESSOR_EXT:=lzma -endif -ROOTFS_TAR_COPYTO:=$(call qstrip,$(BR2_TARGET_ROOTFS_TAR_COPYTO)) - -tarroot: host-fakeroot makedevs - # Use fakeroot to pretend all target binaries are owned by root - rm -f $(BUILD_DIR)/_fakeroot.$(notdir $(TAR_TARGET)) - touch $(BUILD_DIR)/.fakeroot.00000 - cat $(BUILD_DIR)/.fakeroot* > $(BUILD_DIR)/_fakeroot.$(notdir $(TAR_TARGET)) - echo "chown -R 0:0 $(TARGET_DIR)" >> $(BUILD_DIR)/_fakeroot.$(notdir $(TAR_TARGET)) -ifneq ($(TARGET_DEVICE_TABLE),) - # Use fakeroot to pretend to create all needed device nodes - echo "$(HOST_DIR)/usr/bin/makedevs -d $(TARGET_DEVICE_TABLE) $(TARGET_DIR)" \ - >> $(BUILD_DIR)/_fakeroot.$(notdir $(TAR_TARGET)) -endif - # Use fakeroot so tar believes the previous fakery - echo "tar -c$(TAR_OPTS)f $(TAR_TARGET) -C $(TARGET_DIR) ." \ - >> $(BUILD_DIR)/_fakeroot.$(notdir $(TAR_TARGET)) - chmod a+x $(BUILD_DIR)/_fakeroot.$(notdir $(TAR_TARGET)) - $(HOST_DIR)/usr/bin/fakeroot -- $(BUILD_DIR)/_fakeroot.$(notdir $(TAR_TARGET)) -ifneq ($(TAR_COMPRESSOR),) - -rm -f $(TAR_TARGET).$() - PATH="$(STAGING_DIR)/sbin:$(STAGING_DIR)/bin:$(STAGING_DIR)/usr/sbin:$(STAGING_DIR)/usr/bin:$(PATH)" $(TAR_COMPRESSOR) $(TAR_TARGET) > $(TAR_TARGET).$(TAR_COMPRESSOR_EXT) -endif -ifneq ($(ROOTFS_TAR_COPYTO),) - $(Q)cp -f $(TAR_TARGET) $(ROOTFS_TAR_COPYTO) -endif - -@rm -f $(BUILD_DIR)/_fakeroot.$(notdir $(TAR_TARGET)) - -tarroot-source: - -tarroot-clean: - -tarroot-dirclean: - -############################################################# -# -# Toplevel Makefile options -# -############################################################# -ifeq ($(BR2_TARGET_ROOTFS_TAR),y) -TARGETS+=tarroot -endif diff --git a/target/ubifs/ubifsroot.mk b/target/ubifs/ubifsroot.mk deleted file mode 100644 index e73d4f926..000000000 --- a/target/ubifs/ubifsroot.mk +++ /dev/null @@ -1,125 +0,0 @@ -############################################################# -# -# mkfs.ubifs to build to target ubifs filesystems -# -############################################################# -#MKFS_UBIFS_VERSION=2582f128dad78591bc3adcc87c343c690bb82e61 -#MKFS_UBIFS_URL=http://git.infradead.org/users/dedekind/mkfs.ubifs.git?a=snapshot;h=$(MKFS_UBIFS_VERSION);sf=tgz -MKFS_UBIFS_VERSION=v0.4 -MKFS_UBIFS_URL=http://git.infradead.org/users/dedekind/mkfs.ubifs.git?a=snapshot;h=refs/tags/mkfs.ubifs-$(MKFS_UBIFS_VERSION);sf=tgz -MKFS_UBIFS_SOURCE:=mkfs.ubifs-$(MKFS_UBIFS_VERSION).tar.gz -MKFS_UBIFS_DIR:= $(BUILD_DIR)/mkfs-ubifs-$(MKFS_UBIFS_VERSION) -MKFS_UBIFS_CAT:=$(ZCAT) -MKFS_UBIFS_NAME:=mkfs.ubifs - -$(DL_DIR)/$(MKFS_UBIFS_SOURCE): - $(WGET) -O $(DL_DIR)/$(MKFS_UBIFS_SOURCE) "$(MKFS_UBIFS_URL)" - -$(MKFS_UBIFS_DIR)/.unpacked: $(DL_DIR)/$(MKFS_UBIFS_SOURCE) - $(ZCAT) $(DL_DIR)/$(MKFS_UBIFS_SOURCE) | tar -C $(BUILD_DIR) -xvf - - mv $(BUILD_DIR)/$(MKFS_UBIFS_NAME) $(MKFS_UBIFS_DIR) - toolchain/patch-kernel.sh $(MKFS_UBIFS_DIR) target/ubifs/ mkfs-ubifs-\*.patch - touch $@ - -$(MKFS_UBIFS_DIR)/mkfs.ubifs: $(MKFS_UBIFS_DIR)/.unpacked - $(MAKE) -C $(MKFS_UBIFS_DIR) - touch -c $@ - -mkfs.ubifs-dirclean: - rm -rf $(MKFS_UBIFS_DIR) - -mkfs.ubifs: $(MKFS_UBIFS_DIR)/mkfs.ubifs - -############################################################# -# -# Build the ubifs root filesystem image -# -############################################################# - -UBIFS_OPTS := -e $(BR2_TARGET_ROOTFS_UBIFS_LEBSIZE) -c $(BR2_TARGET_ROOTFS_UBIFS_MAXLEBCNT) -m $(BR2_TARGET_ROOTFS_UBIFS_MINIOSIZE) - -UBIFS_BASE := $(call qstrip,$(BR2_TARGET_ROOTFS_UBIFS_OUTPUT)) - -ifeq ($(BR2_TARGET_ROOTFS_UBIFS_RT_ZLIB),y) -UBIFS_OPTS += -x zlib -endif -ifeq ($(BR2_TARGET_ROOTFS_UBIFS_RT_LZI),y) -UBIFS_OPTS += -x lzo -endif -ifeq ($(BR2_TARGET_ROOTFS_UBIFS_RT_NONE),y) -UBIFS_OPTS += -x none -endif - -UBIFS_ROOTFS_COMPRESSOR:= -UBIFS_ROOTFS_COMPRESSOR_EXT:= -UBIFS_ROOTFS_COMPRESSOR_PREREQ:= -ifeq ($(BR2_TARGET_ROOTFS_UBIFS_GZIP),y) -UBIFS_ROOTFS_COMPRESSOR:=gzip -9 -c -UBIFS_ROOTFS_COMPRESSOR_EXT:=gz -#UBIFS_ROOTFS_COMPRESSOR_PREREQ:= gzip-host -endif -ifeq ($(BR2_TARGET_ROOTFS_UBIFS_BZIP2),y) -UBIFS_ROOTFS_COMPRESSOR:=bzip2 -9 -c -UBIFS_ROOTFS_COMPRESSOR_EXT:=bz2 -#UBIFS_ROOTFS_COMPRESSOR_PREREQ:= bzip2-host -endif -ifeq ($(BR2_TARGET_ROOTFS_UBIFS_LZMA),y) -UBIFS_ROOTFS_COMPRESSOR:=lzma -9 -c -UBIFS_ROOTFS_COMPRESSOR_EXT:=lzma -UBIFS_ROOTFS_COMPRESSOR_PREREQ:= lzma-host -endif - -ifneq ($(UBIFS_ROOTFS_COMPRESSOR),) -UBIFS_TARGET := $(UBIFS_BASE).$(UBIFS_ROOTFS_COMPRESSOR_EXT) -else -UBIFS_TARGET := $(UBIFS_BASE) -endif - -$(UBIFS_BASE): host-fakeroot makedevs mkfs.ubifs - # Use fakeroot to pretend all target binaries are owned by root - rm -f $(BUILD_DIR)/_fakeroot.$(notdir $(UBIFS_TARGET)) - touch $(BUILD_DIR)/.fakeroot.00000 - cat $(BUILD_DIR)/.fakeroot* > $(BUILD_DIR)/_fakeroot.$(notdir $(UBIFS_TARGET)) - echo "chown -R 0:0 $(TARGET_DIR)" >> $(BUILD_DIR)/_fakeroot.$(notdir $(UBIFS_TARGET)) -ifneq ($(TARGET_DEVICE_TABLE),) - # Use fakeroot to pretend to create all needed device nodes - echo "$(HOST_DIR)/usr/bin/makedevs -d $(TARGET_DEVICE_TABLE) $(TARGET_DIR)" \ - >> $(BUILD_DIR)/_fakeroot.$(notdir $(UBIFS_TARGET)) -endif - # Use fakeroot so mkfs.ubifs believes the previous fakery - echo "$(MKFS_UBIFS_DIR)/mkfs.ubifs -d $(TARGET_DIR) " \ - "$(UBIFS_OPTS) -o $(UBIFS_BASE)" >> $(BUILD_DIR)/_fakeroot.$(notdir $(UBIFS_TARGET)) - chmod a+x $(BUILD_DIR)/_fakeroot.$(notdir $(UBIFS_TARGET)) - $(HOST_DIR)/usr/bin/fakeroot -- $(BUILD_DIR)/_fakeroot.$(notdir $(UBIFS_TARGET)) - -@rm -f $(BUILD_DIR)/_fakeroot.$(notdir $(UBIFS_TARGET)) - -ifneq ($(UBIFS_ROOTFS_COMPRESSOR),) -$(UBIFS_BASE).$(UBIFS_ROOTFS_COMPRESSOR_EXT): $(UBIFS_ROOTFS_COMPRESSOR_PREREQ) $(UBIFS_BASE) - $(UBIFS_ROOTFS_COMPRESSOR) $(UBIFS_BASE) > $(UBIFS_TARGET) -endif - -UBIFS_COPYTO := $(call qstrip,$(BR2_TARGET_ROOTFS_UBIFS_COPYTO)) - -ubifsroot: $(UBIFS_TARGET) - @ls -l $(UBIFS_TARGET) -ifneq ($(UBIFS_COPYTO),) - @cp -f $(UBIFS_TARGET) $(UBIFS_COPYTO) -endif - -ubifsroot-source: $(DL_DIR)/$(MKFS_UBIFS_SOURCE) - -ubifsroot-clean: - -$(MAKE) -C $(MKFS_UBIFS_DIR) clean - -ubifsroot-dirclean: - rm -rf $(MKFS_UBIFS_DIR) - -############################################################# -# -# Toplevel Makefile options -# -############################################################# -ifeq ($(BR2_TARGET_ROOTFS_UBIFS),y) -TARGETS+=ubifsroot -endif - diff --git a/target/xtensa/defconfig b/target/xtensa/defconfig index 07ab10bf4..f9b53a36c 100644 --- a/target/xtensa/defconfig +++ b/target/xtensa/defconfig @@ -94,7 +94,6 @@ BR2_TOOLCHAIN_BUILDROOT=y # # Other development stuff # -BR2_HOST_FAKEROOT=y # BR2_PACKAGE_LIBINTL is not set # For NFS mount: BR2_PACKAGE_PORTMAP=y diff --git a/toolchain/dependencies/dependencies.sh b/toolchain/dependencies/dependencies.sh index 68b275176..013c1d57d 100755 --- a/toolchain/dependencies/dependencies.sh +++ b/toolchain/dependencies/dependencies.sh @@ -122,7 +122,7 @@ if ! $SHELL --version 2>&1 | grep -q '^GNU bash'; then fi; # Check that a few mandatory programs are installed -for prog in awk bison flex msgfmt makeinfo patch gzip bzip2 perl tar wget ; do +for prog in awk bison flex msgfmt makeinfo patch gzip bzip2 perl tar wget cpio ; do if ! which $prog > /dev/null ; then /bin/echo -e "\nYou must install '$prog' on your build machine"; if test $prog = "makeinfo" ; then |