[Runnix-commits] SF.net SVN: runnix:[96] trunk/target/squashfs

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Revision: 96
          http://runnix.svn.sourceforge.net/runnix/?rev=96&view=rev
Author:   krisk84
Date:     2010-03-03 20:05:17 +0000 (Wed, 03 Mar 2010)

Log Message:
-----------
update squashfs

Modified Paths:
--------------
    trunk/target/squashfs/squashfsroot.mk

Added Paths:
-----------
    trunk/target/squashfs/target-squashfs-getnprocs.patch

Modified: trunk/target/squashfs/squashfsroot.mk
===================================================================

--- trunk/target/squashfs/squashfsroot.mk	2010-03-03 19:34:55 UTC (rev 95)
+++ trunk/target/squashfs/squashfsroot.mk	2010-03-03 20:05:17 UTC (rev 96)
@@ -3,30 +3,50 @@
 # mksquashfs to build to target squashfs filesystems
 #
 #############################################################
-SQUASHFS_DIR=$(BUILD_DIR)/squashfs3.0
-SQUASHFS_SOURCE=squashfs3.0.tar.gz
-SQUASHFS_SITE=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/squashfs
+SQUASHFS_VERSION:=3.2-r2
+SQUASHFS_DIR:=$(BUILD_DIR)/squashfs$(SQUASHFS_VERSION)
+SQUASHFS_TARGET_DIR:=$(BUILD_DIR)/squashfs$(SQUASHFS_VERSION)-target
+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):
 	 $(WGET) -P $(DL_DIR) $(SQUASHFS_SITE)/$(SQUASHFS_SOURCE)
 
-$(SQUASHFS_DIR)/.unpacked: $(DL_DIR)/$(SQUASHFS_SOURCE) #$(SQUASHFS_PATCH)
-	zcat $(DL_DIR)/$(SQUASHFS_SOURCE) | tar -C $(BUILD_DIR) -xvf -
+$(SQUASHFS_DIR)/.unpacked: $(DL_DIR)/$(SQUASHFS_SOURCE)
+	$(SQUASHFS_CAT) $(DL_DIR)/$(SQUASHFS_SOURCE) | tar -C $(BUILD_DIR) -xvf -
 	toolchain/patch-kernel.sh $(SQUASHFS_DIR) target/squashfs/ squashfs\*.patch
+	cp -R $(SQUASHFS_DIR) $(SQUASHFS_TARGET_DIR)
+	toolchain/patch-kernel.sh $(SQUASHFS_TARGET_DIR) \
+	target/squashfs/ target-squashfs\*.patch
 	touch $(SQUASHFS_DIR)/.unpacked
+	touch $(SQUASHFS_TARGET_DIR)/.unpacked
 
 $(SQUASHFS_DIR)/squashfs-tools/mksquashfs: $(SQUASHFS_DIR)/.unpacked
 	$(MAKE) -C $(SQUASHFS_DIR)/squashfs-tools;
 
-squashfs: $(SQUASHFS_DIR)/squashfs-tools/mksquashfs
+$(SQUASHFS_TARGET_DIR)/squashfs-tools/mksquashfs: $(SQUASHFS_DIR)/.unpacked
+	$(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(SQUASHFS_TARGET_DIR)/squashfs-tools;
 
+$(TARGET_DIR)/sbin/mksquashfs: $(SQUASHFS_TARGET_DIR)/squashfs-tools/mksquashfs
+	$(INSTALL) -D -m 0755 $(SQUASHFS_TARGET_DIR)/squashfs-tools/mksquashfs \
+	$(TARGET_DIR)/sbin/mksquashfs
+	-$(STRIP) $(TARGET_DIR)/sbin/mksquashfs
+
+squashfs: $(SQUASHFS_DIR)/squashfs-tools/mksquashfs $(TARGET_DIR)/sbin/mksquashfs
+
+squashfs-target: $(TARGET_DIR)/sbin/mksquashfs
+
 squashfs-source: $(DL_DIR)/$(SQUASHFS_SOURCE)
 
 squashfs-clean:
 	-$(MAKE) -C $(SQUASHFS_DIR)/squashfs-tools clean
+	-$(MAKE) -C $(SQUASHFS_TARGET_DIR)/squashfs-tools clean
+	-rm $(TARGET_DIR)/sbin/mksquashfs
 
 squashfs-dirclean:
 	rm -rf $(SQUASHFS_DIR)
+	rm -rf $(SQUASHFS_TARGET_DIR)
 
 #############################################################
 #
@@ -53,31 +73,31 @@
 SQUASHFS_ENDIANNESS=-be
 endif
 
-squashfsroot: host-fakeroot makedevs $(STAGING_DIR)/fakeroot.env squashfs
+SQUASHFS_TARGET:=$(IMAGE).squashfs
+
+squashfsroot: host-fakeroot makedevs squashfs
 	-@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
-	-$(STAGING_DIR)/usr/bin/fakeroot \
-		-i $(STAGING_DIR)/fakeroot.env \
-		-s $(STAGING_DIR)/fakeroot.env -- \
-		chown -R root:root $(TARGET_DIR)
+	rm -f $(STAGING_DIR)/_fakeroot.$(notdir $(SQUASHFS_TARGET))
+	touch $(STAGING_DIR)/.fakeroot.00000
+	cat $(STAGING_DIR)/.fakeroot* > $(STAGING_DIR)/_fakeroot.$(notdir $(SQUASHFS_TARGET))
+	echo "chown -R 0:0 $(TARGET_DIR)" >> $(STAGING_DIR)/_fakeroot.$(notdir $(SQUASHFS_TARGET))
+ifneq ($(TARGET_DEVICE_TABLE),)
 	# Use fakeroot to pretend to create all needed device nodes
-	$(STAGING_DIR)/usr/bin/fakeroot \
-		-i $(STAGING_DIR)/fakeroot.env \
-		-s $(STAGING_DIR)/fakeroot.env -- \
-		$(STAGING_DIR)/bin/makedevs \
-		-d $(TARGET_DEVICE_TABLE) \
-		$(TARGET_DIR)
+	echo "$(STAGING_DIR)/bin/makedevs -d $(TARGET_DEVICE_TABLE) $(TARGET_DIR)" \
+		>> $(STAGING_DIR)/_fakeroot.$(notdir $(SQUASHFS_TARGET))
+endif
 	# Use fakeroot so mksquashfs believes the previous fakery
-	$(STAGING_DIR)/usr/bin/fakeroot \
-		-i $(STAGING_DIR)/fakeroot.env \
-		-s $(STAGING_DIR)/fakeroot.env -- \
-		$(SQUASHFS_DIR)/squashfs-tools/mksquashfs \
-		    $(TARGET_DIR) \
-		    $(IMAGE).squashfs \
-		    -noappend $(SQUASHFS_ENDIANNESS)
+	echo "$(SQUASHFS_DIR)/squashfs-tools/mksquashfs " \
+		    "$(TARGET_DIR) $(SQUASHFS_TARGET) " \
+		    "-noappend $(SQUASHFS_ENDIANNESS)" \
+		>> $(STAGING_DIR)/_fakeroot.$(notdir $(SQUASHFS_TARGET))
+	chmod a+x $(STAGING_DIR)/_fakeroot.$(notdir $(SQUASHFS_TARGET))
+	$(STAGING_DIR)/usr/bin/fakeroot -- $(STAGING_DIR)/_fakeroot.$(notdir $(SQUASHFS_TARGET))
+	-@rm -f $(STAGING_DIR)/_fakeroot.$(notdir $(SQUASHFS_TARGET))
 
 squashfsroot-source: squashfs-source
 

Added: trunk/target/squashfs/target-squashfs-getnprocs.patch
===================================================================
--- trunk/target/squashfs/target-squashfs-getnprocs.patch	                        (rev 0)
+++ trunk/target/squashfs/target-squashfs-getnprocs.patch	2010-03-03 20:05:17 UTC (rev 96)
@@ -0,0 +1,31 @@
+# --- T2-COPYRIGHT-NOTE-BEGIN ---
+# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
+# 
+# T2 SDE: package/.../uclibc/patches/squashfs-tools-getnprocs.patch
+# Copyright (C) 2006 - 2007 The T2 SDE Project
+# 
+# More information can be found in the files COPYING and README.
+# 
+# This patch file is dual-licensed. It is available under the license the
+# patched project is licensed under, as long as it is an OpenSource license
+# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
+# of the GNU General Public License as published by the Free Software
+# Foundation; either version 2 of the License, or (at your option) any later
+# version.
+# --- T2-COPYRIGHT-NOTE-END ---
+
+--- ./squashfs-tools/mksquashfs.c.orig	2006-08-31 00:07:37.000000000 +0200
++++ ./squashfs-tools/mksquashfs.c	2006-09-01 14:20:24.000000000 +0200
+@@ -2625,8 +2625,12 @@
+ 			processors = 1;
+ 		}
+ #else
++#ifdef __UCLIBC__
++		processors = 1;
++#else
+ 		processors = get_nprocs();
+ #endif
++#endif
+ 	}
+ 
+ 	if((thread = malloc((2 + processors * 2) * sizeof(pthread_t))) == NULL)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.


