* [Buildroot] svn commit: trunk/buildroot/target/ext2
@ 2006-11-28 8:49 aldot at uclibc.org
0 siblings, 0 replies; 9+ messages in thread
From: aldot at uclibc.org @ 2006-11-28 8:49 UTC (permalink / raw)
To: buildroot
Author: aldot
Date: 2006-11-28 00:49:17 -0800 (Tue, 28 Nov 2006)
New Revision: 16701
Log:
- Change LC_ALL=POSIX to LC_ALL=C and remove LANG=C as suggested by vapier.
Modified:
trunk/buildroot/target/ext2/ext2root.mk
Changeset:
Modified: trunk/buildroot/target/ext2/ext2root.mk
===================================================================
--- trunk/buildroot/target/ext2/ext2root.mk 2006-11-28 00:46:49 UTC (rev 16700)
+++ trunk/buildroot/target/ext2/ext2root.mk 2006-11-28 08:49:17 UTC (rev 16701)
@@ -86,7 +86,7 @@
>> $(STAGING_DIR)/_fakeroot.$(notdir $(EXT2_TARGET))
# Use fakeroot so genext2fs believes the previous fakery
ifeq ($(strip $(BR2_TARGET_ROOTFS_EXT2_BLOCKS)),0)
- GENEXT2_REALSIZE=`LANG=C LC_ALL=POSIX du -l -s -c -k $(TARGET_DIR) | grep total | sed -e "s/total//"`; \
+ GENEXT2_REALSIZE=`LC_ALL=C du -l -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`; \
^ permalink raw reply [flat|nested] 9+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/target/ext2
@ 2007-07-30 14:22 aldot at uclibc.org
0 siblings, 0 replies; 9+ messages in thread
From: aldot at uclibc.org @ 2007-07-30 14:22 UTC (permalink / raw)
To: buildroot
Author: aldot
Date: 2007-07-30 07:22:25 -0700 (Mon, 30 Jul 2007)
New Revision: 19340
Log:
- remove stray ';'
Modified:
trunk/buildroot/target/ext2/ext2root.mk
Changeset:
Modified: trunk/buildroot/target/ext2/ext2root.mk
===================================================================
--- trunk/buildroot/target/ext2/ext2root.mk 2007-07-30 12:37:16 UTC (rev 19339)
+++ trunk/buildroot/target/ext2/ext2root.mk 2007-07-30 14:22:25 UTC (rev 19340)
@@ -87,12 +87,13 @@
endif
$(EXT2_BASE): host-fakeroot makedevs genext2fs
- - at find $(TARGET_DIR) -type f -perm +111 | xargs $(STRIP) 2>/dev/null || true;
+ - at find $(TARGET_DIR) -type f -perm +111 | xargs $(STRIP) 2>/dev/null || true
@rm -rf $(TARGET_DIR)/usr/man
@rm -rf $(TARGET_DIR)/usr/share/man
@rm -rf $(TARGET_DIR)/usr/info
@test -d $(TARGET_DIR)/usr/share && \
- rmdir -p --ignore-fail-on-non-empty $(TARGET_DIR)/usr/share
+ rmdir -p --ignore-fail-on-non-empty $(TARGET_DIR)/usr/share || \
+ true
-/sbin/ldconfig -r $(TARGET_DIR) 2>/dev/null
# Use fakeroot to pretend all target binaries are owned by root
rm -f $(STAGING_DIR)/_fakeroot.$(notdir $(EXT2_TARGET))
^ permalink raw reply [flat|nested] 9+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/target/ext2
@ 2007-07-30 12:37 aldot at uclibc.org
0 siblings, 0 replies; 9+ messages in thread
From: aldot at uclibc.org @ 2007-07-30 12:37 UTC (permalink / raw)
To: buildroot
Author: aldot
Date: 2007-07-30 05:37:16 -0700 (Mon, 30 Jul 2007)
New Revision: 19339
Log:
- test if dir exists before trying to rmdir it.
Fixes failure due to non-existing usr/share dir on the target.
Modified:
trunk/buildroot/target/ext2/ext2root.mk
Changeset:
Modified: trunk/buildroot/target/ext2/ext2root.mk
===================================================================
--- trunk/buildroot/target/ext2/ext2root.mk 2007-07-30 12:32:37 UTC (rev 19338)
+++ trunk/buildroot/target/ext2/ext2root.mk 2007-07-30 12:37:16 UTC (rev 19339)
@@ -91,7 +91,8 @@
@rm -rf $(TARGET_DIR)/usr/man
@rm -rf $(TARGET_DIR)/usr/share/man
@rm -rf $(TARGET_DIR)/usr/info
- @rmdir -p --ignore-fail-on-non-empty $(TARGET_DIR)/usr/share
+ @test -d $(TARGET_DIR)/usr/share && \
+ rmdir -p --ignore-fail-on-non-empty $(TARGET_DIR)/usr/share
-/sbin/ldconfig -r $(TARGET_DIR) 2>/dev/null
# Use fakeroot to pretend all target binaries are owned by root
rm -f $(STAGING_DIR)/_fakeroot.$(notdir $(EXT2_TARGET))
^ permalink raw reply [flat|nested] 9+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/target/ext2
@ 2007-03-20 16:42 aldot at uclibc.org
0 siblings, 0 replies; 9+ messages in thread
From: aldot at uclibc.org @ 2007-03-20 16:42 UTC (permalink / raw)
To: buildroot
Author: aldot
Date: 2007-03-20 09:42:51 -0700 (Tue, 20 Mar 2007)
New Revision: 18180
Log:
- bump version. Closes #1225
Added:
trunk/buildroot/target/ext2/genext2fs-1.4-nosquash.patch
trunk/buildroot/target/ext2/genext2fs-1.4-remove_ugly_warnings.patch
Removed:
trunk/buildroot/target/ext2/genext2fs-01-cvs-updates.patch
trunk/buildroot/target/ext2/genext2fs-02-nosquash_devtable.patch
Modified:
trunk/buildroot/target/ext2/ext2root.mk
Changeset:
Sorry, the patch is too large to include (9837 lines).
Please use ViewCVS to see it!
http://uclibc.org/cgi-bin/viewcvs.cgi?view=rev&root=svn&rev=18180
^ permalink raw reply [flat|nested] 9+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/target/ext2
@ 2006-12-22 12:34 aldot at uclibc.org
0 siblings, 0 replies; 9+ messages in thread
From: aldot at uclibc.org @ 2006-12-22 12:34 UTC (permalink / raw)
To: buildroot
Author: aldot
Date: 2006-12-22 04:34:35 -0800 (Fri, 22 Dec 2006)
New Revision: 17050
Log:
- BR2_TARGET_ROOTFS_EXT2_RESBLKS is ignored if it is 0. It should be used if it is 0 (since 0 means something here--"do not reserve any blocks".
Thanks to timw. Closes #484.
Modified:
trunk/buildroot/target/ext2/ext2root.mk
Changeset:
Modified: trunk/buildroot/target/ext2/ext2root.mk
===================================================================
--- trunk/buildroot/target/ext2/ext2root.mk 2006-12-22 12:22:15 UTC (rev 17049)
+++ trunk/buildroot/target/ext2/ext2root.mk 2006-12-22 12:34:35 UTC (rev 17050)
@@ -54,7 +54,7 @@
EXT2_OPTS += -i $(strip $(BR2_TARGET_ROOTFS_EXT2_INODES))
endif
-ifneq ($(strip $(BR2_TARGET_ROOTFS_EXT2_RESBLKS)),0)
+ifneq ($(strip $(BR2_TARGET_ROOTFS_EXT2_RESBLKS)),)
EXT2_OPTS += -r $(strip $(BR2_TARGET_ROOTFS_EXT2_RESBLKS))
endif
^ permalink raw reply [flat|nested] 9+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/target/ext2
@ 2006-12-20 16:45 aldot at uclibc.org
0 siblings, 0 replies; 9+ messages in thread
From: aldot at uclibc.org @ 2006-12-20 16:45 UTC (permalink / raw)
To: buildroot
Author: aldot
Date: 2006-12-20 08:45:47 -0800 (Wed, 20 Dec 2006)
New Revision: 17017
Log:
- Lars Munch noticed that i broke the ext2 compressor. Thanks!
Modified:
trunk/buildroot/target/ext2/ext2root.mk
Changeset:
Modified: trunk/buildroot/target/ext2/ext2root.mk
===================================================================
--- trunk/buildroot/target/ext2/ext2root.mk 2006-12-20 16:38:22 UTC (rev 17016)
+++ trunk/buildroot/target/ext2/ext2root.mk 2006-12-20 16:45:47 UTC (rev 17017)
@@ -61,8 +61,6 @@
EXT2_BASE := $(subst ",,$(BR2_TARGET_ROOTFS_EXT2_OUTPUT))
#")
-EXT2_TARGET := $(EXT2_BASE)
-
EXT2_ROOTFS_COMPRESSOR:=
EXT2_ROOTFS_COMPRESSOR_EXT:=
EXT2_ROOTFS_COMPRESSOR_PREREQ:=
@@ -82,6 +80,12 @@
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
- at find $(TARGET_DIR) -type f -perm +111 | xargs $(STRIP) 2>/dev/null || true;
@rm -rf $(TARGET_DIR)/usr/man
@@ -116,8 +120,8 @@
- at rm -f $(STAGING_DIR)/_fakeroot.$(notdir $(EXT2_TARGET))
ifneq ($(EXT2_ROOTFS_COMPRESSOR),)
-$(EXT2_TARGET).(EXT2_ROOTFS_COMPRESSOR_EXT): $(EXT2_ROOTFS_COMPRESSOR_PREREQ) $(EXT2_BASE)
- $(EXT2_ROOTFS_COMPRESSOR) $(EXT2_TARGET) > $(EXT2_TARGET).$(EXT2_ROOTFS_COMPRESSOR_EXT)
+$(EXT2_BASE).$(EXT2_ROOTFS_COMPRESSOR_EXT): $(EXT2_ROOTFS_COMPRESSOR_PREREQ) $(EXT2_BASE)
+ $(EXT2_ROOTFS_COMPRESSOR) $(EXT2_BASE) > $(EXT2_TARGET)
endif
EXT2_COPYTO := $(strip $(subst ",,$(BR2_TARGET_ROOTFS_EXT2_COPYTO)))
^ permalink raw reply [flat|nested] 9+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/target/ext2
@ 2006-12-14 15:47 aldot at uclibc.org
0 siblings, 0 replies; 9+ messages in thread
From: aldot at uclibc.org @ 2006-12-14 15:47 UTC (permalink / raw)
To: buildroot
Author: aldot
Date: 2006-12-14 07:47:50 -0800 (Thu, 14 Dec 2006)
New Revision: 16929
Log:
- update the ext2 rootfs compression mechanism to allow for gzip, bzip2, lzma or none
Modified:
trunk/buildroot/target/ext2/Config.in
trunk/buildroot/target/ext2/ext2root.mk
Changeset:
Modified: trunk/buildroot/target/ext2/Config.in
===================================================================
--- trunk/buildroot/target/ext2/Config.in 2006-12-14 15:41:29 UTC (rev 16928)
+++ trunk/buildroot/target/ext2/Config.in 2006-12-14 15:47:50 UTC (rev 16929)
@@ -29,17 +29,40 @@
depends on BR2_TARGET_ROOTFS_EXT2
default "$(IMAGE).ext2"
-config BR2_TARGET_ROOTFS_EXT2_GZ
- bool "gzip the output file"
- depends on BR2_TARGET_ROOTFS_EXT2
- default n
+choice
+ prompt "Compression method"
+ default BR2_TARGET_ROOTFS_EXT2_NONE
+ depends on BR2_TARGET_ROOTFS_EXT2
+ help
+ Select compressor for ext2 filesystem of the root filesystem
+config BR2_TARGET_ROOTFS_EXT2_NONE
+ bool "no compression"
+ help
+ Do not compress the ext2 filesystem.
+
+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 the output file"
- depends on BR2_TARGET_ROOTFS_EXT2
- select BR2_PACKAGE_LZMA_HOST
- default n
+ 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..."
Modified: trunk/buildroot/target/ext2/ext2root.mk
===================================================================
--- trunk/buildroot/target/ext2/ext2root.mk 2006-12-14 15:41:29 UTC (rev 16928)
+++ trunk/buildroot/target/ext2/ext2root.mk 2006-12-14 15:47:50 UTC (rev 16929)
@@ -59,17 +59,28 @@
endif
EXT2_BASE := $(subst ",,$(BR2_TARGET_ROOTFS_EXT2_OUTPUT))
-# " stupid syntax highlighting does not like unmatched quote from above line
+#")
-ifeq ($(strip $(BR2_TARGET_ROOTFS_EXT2_GZ)),y)
-EXT2_TARGET := $(EXT2_BASE).gz
-else
EXT2_TARGET := $(EXT2_BASE)
-endif
-ifeq ($(strip $(BR2_TARGET_ROOTFS_EXT2_LZMA)),y)
-EXT2_TARGET := $(EXT2_BASE).lzma
+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
$(EXT2_BASE): host-fakeroot makedevs genext2fs
- at find $(TARGET_DIR) -type f -perm +111 | xargs $(STRIP) 2>/dev/null || true;
@@ -104,14 +115,13 @@
$(STAGING_DIR)/usr/bin/fakeroot -- $(STAGING_DIR)/_fakeroot.$(notdir $(EXT2_TARGET))
- at rm -f $(STAGING_DIR)/_fakeroot.$(notdir $(EXT2_TARGET))
-$(EXT2_BASE).gz: $(EXT2_BASE)
- @gzip --best -fv $(EXT2_BASE)
+ifneq ($(EXT2_ROOTFS_COMPRESSOR),)
+$(EXT2_TARGET).(EXT2_ROOTFS_COMPRESSOR_EXT): $(EXT2_ROOTFS_COMPRESSOR_PREREQ) $(EXT2_BASE)
+ $(EXT2_ROOTFS_COMPRESSOR) $(EXT2_TARGET) > $(EXT2_TARGET).$(EXT2_ROOTFS_COMPRESSOR_EXT)
+endif
-$(EXT2_BASE).lzma: lzma-host $(EXT2_BASE)
- @$(STAGING_DIR)/bin/lzma -vc $(EXT2_BASE) > $(EXT2_BASE).lzma
-
EXT2_COPYTO := $(strip $(subst ",,$(BR2_TARGET_ROOTFS_EXT2_COPYTO)))
-# " stupid syntax highlighting does not like unmatched quote from above line
+# "))
ext2root: $(EXT2_TARGET)
@ls -l $(EXT2_TARGET)
^ permalink raw reply [flat|nested] 9+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/target/ext2
@ 2006-11-29 19:02 aldot at uclibc.org
0 siblings, 0 replies; 9+ messages in thread
From: aldot at uclibc.org @ 2006-11-29 19:02 UTC (permalink / raw)
To: buildroot
Author: aldot
Date: 2006-11-29 11:02:47 -0800 (Wed, 29 Nov 2006)
New Revision: 16724
Log:
- use the HOSTCC as set by the user.
Modified:
trunk/buildroot/target/ext2/ext2root.mk
Changeset:
Modified: trunk/buildroot/target/ext2/ext2root.mk
===================================================================
--- trunk/buildroot/target/ext2/ext2root.mk 2006-11-29 18:59:43 UTC (rev 16723)
+++ trunk/buildroot/target/ext2/ext2root.mk 2006-11-29 19:02:47 UTC (rev 16724)
@@ -20,6 +20,7 @@
chmod a+x $(GENEXT2_DIR)/configure
(cd $(GENEXT2_DIR); rm -rf config.cache; \
./configure \
+ CC="$(HOSTCC)" \
--prefix=$(STAGING_DIR) \
);
touch $(GENEXT2_DIR)/.configured
^ permalink raw reply [flat|nested] 9+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/target/ext2
@ 2006-11-22 23:36 aldot at uclibc.org
0 siblings, 0 replies; 9+ messages in thread
From: aldot at uclibc.org @ 2006-11-22 23:36 UTC (permalink / raw)
To: buildroot
Author: aldot
Date: 2006-11-22 15:36:41 -0800 (Wed, 22 Nov 2006)
New Revision: 16642
Log:
- pass a LC_ALL to du to avoid i18n trouble when calculating the size.
Fixes #1044
Modified:
trunk/buildroot/target/ext2/ext2root.mk
Changeset:
Modified: trunk/buildroot/target/ext2/ext2root.mk
===================================================================
--- trunk/buildroot/target/ext2/ext2root.mk 2006-11-22 23:22:06 UTC (rev 16641)
+++ trunk/buildroot/target/ext2/ext2root.mk 2006-11-22 23:36:41 UTC (rev 16642)
@@ -86,7 +86,7 @@
>> $(STAGING_DIR)/_fakeroot.$(notdir $(EXT2_TARGET))
# Use fakeroot so genext2fs believes the previous fakery
ifeq ($(strip $(BR2_TARGET_ROOTFS_EXT2_BLOCKS)),0)
- GENEXT2_REALSIZE=`LANG=C du -l -s -c -k $(TARGET_DIR) | grep total | sed -e "s/total//"`; \
+ GENEXT2_REALSIZE=`LANG=C LC_ALL=POSIX du -l -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`; \
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2007-07-30 14:22 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2006-11-28 8:49 [Buildroot] svn commit: trunk/buildroot/target/ext2 aldot at uclibc.org
-- strict thread matches above, loose matches on Subject: below --
2007-07-30 14:22 aldot at uclibc.org
2007-07-30 12:37 aldot at uclibc.org
2007-03-20 16:42 aldot at uclibc.org
2006-12-22 12:34 aldot at uclibc.org
2006-12-20 16:45 aldot at uclibc.org
2006-12-14 15:47 aldot at uclibc.org
2006-11-29 19:02 aldot at uclibc.org
2006-11-22 23:36 aldot at uclibc.org
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox