* [Buildroot] svn commit: trunk/buildroot/target/cpio
@ 2006-11-22 19:58 aldot at uclibc.org
2006-11-22 21:12 ` M. Edward Borasky
0 siblings, 1 reply; 8+ messages in thread
From: aldot at uclibc.org @ 2006-11-22 19:58 UTC (permalink / raw)
To: buildroot
Author: aldot
Date: 2006-11-22 11:58:35 -0800 (Wed, 22 Nov 2006)
New Revision: 16633
Log:
- fix indentation
Modified:
trunk/buildroot/target/cpio/cpioroot.mk
Changeset:
Modified: trunk/buildroot/target/cpio/cpioroot.mk
===================================================================
--- trunk/buildroot/target/cpio/cpioroot.mk 2006-11-22 19:18:47 UTC (rev 16632)
+++ trunk/buildroot/target/cpio/cpioroot.mk 2006-11-22 19:58:35 UTC (rev 16633)
@@ -7,7 +7,7 @@
CPIO_TARGET:=$(IMAGE).cpio
cpioroot-init:
- ln -s sbin/init $(TARGET_DIR)/init
+ ln -s sbin/init $(TARGET_DIR)/init
cpioroot: host-fakeroot makedevs cpioroot-init
- at find $(TARGET_DIR) -type f -perm +111 | xargs $(STRIP) 2>/dev/null || true;
^ permalink raw reply [flat|nested] 8+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/target/cpio
@ 2006-11-22 20:21 aldot at uclibc.org
0 siblings, 0 replies; 8+ messages in thread
From: aldot at uclibc.org @ 2006-11-22 20:21 UTC (permalink / raw)
To: buildroot
Author: aldot
Date: 2006-11-22 12:21:24 -0800 (Wed, 22 Nov 2006)
New Revision: 16634
Log:
- fix indentation, second take :(
Modified:
trunk/buildroot/target/cpio/cpioroot.mk
Changeset:
Modified: trunk/buildroot/target/cpio/cpioroot.mk
===================================================================
--- trunk/buildroot/target/cpio/cpioroot.mk 2006-11-22 19:58:35 UTC (rev 16633)
+++ trunk/buildroot/target/cpio/cpioroot.mk 2006-11-22 20:21:24 UTC (rev 16634)
@@ -10,24 +10,24 @@
ln -s sbin/init $(TARGET_DIR)/init
cpioroot: host-fakeroot makedevs cpioroot-init
- - 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/info
- -/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 $(TAR_TARGET))
- touch $(STAGING_DIR)/.fakeroot.00000
- cat $(STAGING_DIR)/.fakeroot* > $(STAGING_DIR)/_fakeroot.$(notdir $(CPIO_TARGET))
- echo "chown -R root:root $(TARGET_DIR)" >> $(STAGING_DIR)/_fakeroot.$(notdir $(CPIO_TARGET))
- # Use fakeroot to pretend to create all needed device nodes
- echo "$(STAGING_DIR)/bin/makedevs -d $(TARGET_DEVICE_TABLE) $(TARGET_DIR)" \
- >> $(STAGING_DIR)/_fakeroot.$(notdir $(CPIO_TARGET))
- # Use fakeroot so tar believes the previous fakery
- echo "cd $(TARGET_DIR) && find . | cpio --quiet -o -H newc > $(CPIO_TARGET)" \
- >> $(STAGING_DIR)/_fakeroot.$(notdir $(CPIO_TARGET))
- chmod a+x $(STAGING_DIR)/_fakeroot.$(notdir $(CPIO_TARGET))
- $(STAGING_DIR)/usr/bin/fakeroot -- $(STAGING_DIR)/_fakeroot.$(notdir $(CPIO_TARGET))
- #- at rm -f $(STAGING_DIR)/_fakeroot.$(notdir $(CPIO_TARGET))
+ - 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/info
+ -/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 $(TAR_TARGET))
+ touch $(STAGING_DIR)/.fakeroot.00000
+ cat $(STAGING_DIR)/.fakeroot* > $(STAGING_DIR)/_fakeroot.$(notdir $(CPIO_TARGET))
+ echo "chown -R root:root $(TARGET_DIR)" >> $(STAGING_DIR)/_fakeroot.$(notdir $(CPIO_TARGET))
+ # Use fakeroot to pretend to create all needed device nodes
+ echo "$(STAGING_DIR)/bin/makedevs -d $(TARGET_DEVICE_TABLE) $(TARGET_DIR)" \
+ >> $(STAGING_DIR)/_fakeroot.$(notdir $(CPIO_TARGET))
+ # Use fakeroot so tar believes the previous fakery
+ echo "cd $(TARGET_DIR) && find . | cpio --quiet -o -H newc > $(CPIO_TARGET)" \
+ >> $(STAGING_DIR)/_fakeroot.$(notdir $(CPIO_TARGET))
+ chmod a+x $(STAGING_DIR)/_fakeroot.$(notdir $(CPIO_TARGET))
+ $(STAGING_DIR)/usr/bin/fakeroot -- $(STAGING_DIR)/_fakeroot.$(notdir $(CPIO_TARGET))
+ #- at rm -f $(STAGING_DIR)/_fakeroot.$(notdir $(CPIO_TARGET))
cpioroot-source:
^ permalink raw reply [flat|nested] 8+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/target/cpio
2006-11-22 19:58 aldot at uclibc.org
@ 2006-11-22 21:12 ` M. Edward Borasky
0 siblings, 0 replies; 8+ messages in thread
From: M. Edward Borasky @ 2006-11-22 21:12 UTC (permalink / raw)
To: buildroot
aldot at uclibc.org wrote:
> Author: aldot
> Date: 2006-11-22 11:58:35 -0800 (Wed, 22 Nov 2006)
> New Revision: 16633
>
> Log:
> - fix indentation
>
>
> Modified:
> trunk/buildroot/target/cpio/cpioroot.mk
>
>
> Changeset:
> Modified: trunk/buildroot/target/cpio/cpioroot.mk
> ===================================================================
> --- trunk/buildroot/target/cpio/cpioroot.mk 2006-11-22 19:18:47 UTC (rev 16632)
> +++ trunk/buildroot/target/cpio/cpioroot.mk 2006-11-22 19:58:35 UTC (rev 16633)
> @@ -7,7 +7,7 @@
> CPIO_TARGET:=$(IMAGE).cpio
>
> cpioroot-init:
> - ln -s sbin/init $(TARGET_DIR)/init
> + ln -s sbin/init $(TARGET_DIR)/init
>
> cpioroot: host-fakeroot makedevs cpioroot-init
> - at find $(TARGET_DIR) -type f -perm +111 | xargs $(STRIP) 2>/dev/null || true;
>
> _______________________________________________
> buildroot mailing list
> buildroot at uclibc.org
> http://busybox.net/mailman/listinfo/buildroot
>
>
It's more than just line 10 ... fix line 10 and it moves to line 13 :(
--
M. Edward (Ed) Borasky, FBG, AB, PTA, PGS, MS, MNLP, NST, ACMC(P)
http://borasky-research.blogspot.com/
If God had meant for carrots to be eaten cooked, He would have given rabbits fire.
^ permalink raw reply [flat|nested] 8+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/target/cpio
@ 2006-11-22 21:24 aldot at uclibc.org
2006-11-23 8:38 ` Goetz Bock
0 siblings, 1 reply; 8+ messages in thread
From: aldot at uclibc.org @ 2006-11-22 21:24 UTC (permalink / raw)
To: buildroot
Author: aldot
Date: 2006-11-22 13:24:58 -0800 (Wed, 22 Nov 2006)
New Revision: 16637
Log:
Modified:
trunk/buildroot/target/cpio/cpioroot.mk
Changeset:
Modified: trunk/buildroot/target/cpio/cpioroot.mk
===================================================================
--- trunk/buildroot/target/cpio/cpioroot.mk 2006-11-22 21:02:21 UTC (rev 16636)
+++ trunk/buildroot/target/cpio/cpioroot.mk 2006-11-22 21:24:58 UTC (rev 16637)
@@ -7,6 +7,7 @@
CPIO_TARGET:=$(IMAGE).cpio
cpioroot-init:
+ rm -f $(TARGET_DIR)/init
ln -s sbin/init $(TARGET_DIR)/init
cpioroot: host-fakeroot makedevs cpioroot-init
^ permalink raw reply [flat|nested] 8+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/target/cpio
2006-11-22 21:24 aldot at uclibc.org
@ 2006-11-23 8:38 ` Goetz Bock
2006-11-23 9:59 ` Goetz Bock
0 siblings, 1 reply; 8+ messages in thread
From: Goetz Bock @ 2006-11-23 8:38 UTC (permalink / raw)
To: buildroot
On Wed, Nov 22 '06 at 13:24, aldot at uclibc.org wrote:
> Author: aldot
> Date: 2006-11-22 13:24:58 -0800 (Wed, 22 Nov 2006)
> New Revision: 16637
>
> Log:
>
>
> Modified:
> trunk/buildroot/target/cpio/cpioroot.mk
Could you change it like this?
Index: target/cpio/cpioroot.mk
===================================================================
--- target/cpio/cpioroot.mk (revision 16643)
+++ target/cpio/cpioroot.mk (working copy)
@@ -7,7 +7,7 @@
CPIO_TARGET:=$(IMAGE).cpio
cpioroot-init:
- rm -f $(TARGET_DIR)/init
+ [ -e $(TARGET_DIR)/init ] || \
ln -s sbin/init $(TARGET_DIR)/init
cpioroot: host-fakeroot makedevs cpioroot-init
My skeleton now countains an init, and that should not be deleted. I
initialy added the link as otherwise the initramfs does not work.
--
/"\ Goetz Bock at blacknet dot de -- secure mobile Linux everNETting
\ / (c) 2006 Creative Commons, Attribution-ShareAlike 2.0 de
X [ 1. Use descriptive subjects - 2. Edit a reply for brevity - ]
/ \ [ 3. Reply to the list - 4. Read the archive *before* you post ]
^ permalink raw reply [flat|nested] 8+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/target/cpio
2006-11-23 8:38 ` Goetz Bock
@ 2006-11-23 9:59 ` Goetz Bock
0 siblings, 0 replies; 8+ messages in thread
From: Goetz Bock @ 2006-11-23 9:59 UTC (permalink / raw)
To: buildroot
On Thu, Nov 23 '06 at 09:38, Goetz Bock wrote:
>
> On Wed, Nov 22 '06 at 13:24, aldot at uclibc.org wrote:
> > Author: aldot
> Could you change it like this?
> ...
Sorry, but VIM's et messed up the tabs again. :-(
Index: target/cpio/cpioroot.mk
===================================================================
--- target/cpio/cpioroot.mk (revision 16643)
+++ target/cpio/cpioroot.mk (working copy)
@@ -7,7 +7,7 @@
CPIO_TARGET:=$(IMAGE).cpio
cpioroot-init:
- rm -f $(TARGET_DIR)/init
+ [ -e $(TARGET_DIR)/init ] || \
ln -s sbin/init $(TARGET_DIR)/init
cpioroot: host-fakeroot makedevs cpioroot-init
--
/"\ Goetz Bock at blacknet dot de -- secure mobile Linux everNETting
\ / (c) 2006 Creative Commons, Attribution-ShareAlike 2.0 de
X [ 1. Use descriptive subjects - 2. Edit a reply for brevity - ]
/ \ [ 3. Reply to the list - 4. Read the archive *before* you post ]
^ permalink raw reply [flat|nested] 8+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/target/cpio
@ 2007-08-11 22:01 ulf at uclibc.org
0 siblings, 0 replies; 8+ messages in thread
From: ulf at uclibc.org @ 2007-08-11 22:01 UTC (permalink / raw)
To: buildroot
Author: ulf
Date: 2007-08-11 15:01:13 -0700 (Sat, 11 Aug 2007)
New Revision: 19442
Log:
Allow compression of cpio targets
Modified:
trunk/buildroot/target/cpio/Config.in
trunk/buildroot/target/cpio/cpioroot.mk
Changeset:
Modified: trunk/buildroot/target/cpio/Config.in
===================================================================
--- trunk/buildroot/target/cpio/Config.in 2007-08-11 21:58:53 UTC (rev 19441)
+++ trunk/buildroot/target/cpio/Config.in 2007-08-11 22:01:13 UTC (rev 19442)
@@ -5,3 +5,38 @@
help
Build a cpio archive of the root filesystem
+choice
+ prompt "Compression method"
+ default BR2_TARGET_ROOTFS_CPIO_NONE
+ depends on BR2_TARGET_ROOTFS_CPIO
+ help
+ Select compressor for cpio filesystem of the root filesystem
+
+config BR2_TARGET_ROOTFS_CPIO_NONE
+ bool "no compression"
+ help
+ Do not compress the cpio filesystem.
+
+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
+
Modified: trunk/buildroot/target/cpio/cpioroot.mk
===================================================================
--- trunk/buildroot/target/cpio/cpioroot.mk 2007-08-11 21:58:53 UTC (rev 19441)
+++ trunk/buildroot/target/cpio/cpioroot.mk 2007-08-11 22:01:13 UTC (rev 19442)
@@ -4,13 +4,39 @@
#
#############################################################
-CPIO_TARGET:=$(IMAGE).cpio
+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
+
+
cpioroot-init:
rm -f $(TARGET_DIR)/init
ln -s sbin/init $(TARGET_DIR)/init
-cpioroot: host-fakeroot makedevs cpioroot-init
+$(CPIO_BASE): host-fakeroot makedevs cpioroot-init
- 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/info
@@ -18,20 +44,27 @@
# Use fakeroot to pretend all target binaries are owned by root
rm -f $(STAGING_DIR)/_fakeroot.$(notdir $(TAR_TARGET))
touch $(STAGING_DIR)/.fakeroot.00000
- cat $(STAGING_DIR)/.fakeroot* > $(STAGING_DIR)/_fakeroot.$(notdir $(CPIO_TARGET))
- echo "chown -R 0:0 $(TARGET_DIR)" >> $(STAGING_DIR)/_fakeroot.$(notdir $(CPIO_TARGET))
+ cat $(STAGING_DIR)/.fakeroot* > $(STAGING_DIR)/_fakeroot.$(notdir $(CPIO_BASE))
+ echo "chown -R 0:0 $(TARGET_DIR)" >> $(STAGING_DIR)/_fakeroot.$(notdir $(CPIO_BASE))
ifneq ($(TARGET_DEVICE_TABLE),)
# Use fakeroot to pretend to create all needed device nodes
echo "$(STAGING_DIR)/bin/makedevs -d $(TARGET_DEVICE_TABLE) $(TARGET_DIR)" \
- >> $(STAGING_DIR)/_fakeroot.$(notdir $(CPIO_TARGET))
+ >> $(STAGING_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_TARGET)" \
- >> $(STAGING_DIR)/_fakeroot.$(notdir $(CPIO_TARGET))
- chmod a+x $(STAGING_DIR)/_fakeroot.$(notdir $(CPIO_TARGET))
- $(STAGING_DIR)/usr/bin/fakeroot -- $(STAGING_DIR)/_fakeroot.$(notdir $(CPIO_TARGET))
- #- at rm -f $(STAGING_DIR)/_fakeroot.$(notdir $(CPIO_TARGET))
+ echo "cd $(TARGET_DIR) && find . | cpio --quiet -o -H newc > $(CPIO_BASE)" \
+ >> $(STAGING_DIR)/_fakeroot.$(notdir $(CPIO_BASE))
+ chmod a+x $(STAGING_DIR)/_fakeroot.$(notdir $(CPIO_BASE))
+ $(STAGING_DIR)/usr/bin/fakeroot -- $(STAGING_DIR)/_fakeroot.$(notdir $(CPIO_BASE))
+ #- at rm -f $(STAGING_DIR)/_fakeroot.$(notdir $(CPIO_BASE))
+ifneq ($(CPIO_ROOTFS_COMPRESSOR),)
+$(CPIO_BASE).$(CPIO_ROOTFS_COMPRESSOR_EXT): $(CPIO_ROOTFS_COMPRESSOR_PREREQ) $(CPIO_BASE)
+ $(CPIO_ROOTFS_COMPRESSOR) $(CPIO_BASE) > $(CPIO_TARGET)
+endif
+
+cpioroot: $(CPIO_TARGET)
+
cpioroot-source:
cpioroot-clean:
^ permalink raw reply [flat|nested] 8+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/target/cpio
@ 2008-04-06 13:14 nkukard at uclibc.org
0 siblings, 0 replies; 8+ messages in thread
From: nkukard at uclibc.org @ 2008-04-06 13:14 UTC (permalink / raw)
To: buildroot
Author: nkukard
Date: 2008-04-06 06:14:07 -0700 (Sun, 06 Apr 2008)
New Revision: 21655
Log:
Fixed typo in cpioroot, we're working with CPIO_BASE not TAR_TARGET
Modified:
trunk/buildroot/target/cpio/cpioroot.mk
Changeset:
Modified: trunk/buildroot/target/cpio/cpioroot.mk
===================================================================
--- trunk/buildroot/target/cpio/cpioroot.mk 2008-04-06 10:35:22 UTC (rev 21654)
+++ trunk/buildroot/target/cpio/cpioroot.mk 2008-04-06 13:14:07 UTC (rev 21655)
@@ -49,7 +49,7 @@
endif
$(if $(TARGET_LDCONFIG),test -x $(TARGET_LDCONFIG) && $(TARGET_LDCONFIG) -r $(TARGET_DIR) 2>/dev/null)
# Use fakeroot to pretend all target binaries are owned by root
- rm -f $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(TAR_TARGET))
+ rm -f $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(CPIO_BASE))
touch $(PROJECT_BUILD_DIR)/.fakeroot.00000
cat $(PROJECT_BUILD_DIR)/.fakeroot* > $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(CPIO_BASE))
echo "chown -R 0:0 $(TARGET_DIR)" >> $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(CPIO_BASE))
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2008-04-06 13:14 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2006-11-22 20:21 [Buildroot] svn commit: trunk/buildroot/target/cpio aldot at uclibc.org
-- strict thread matches above, loose matches on Subject: below --
2008-04-06 13:14 nkukard at uclibc.org
2007-08-11 22:01 ulf at uclibc.org
2006-11-22 21:24 aldot at uclibc.org
2006-11-23 8:38 ` Goetz Bock
2006-11-23 9:59 ` Goetz Bock
2006-11-22 19:58 aldot at uclibc.org
2006-11-22 21:12 ` M. Edward Borasky
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox