[Runnix-commits] SF.net SVN: runnix:[136] branches/0.3

[<abe...@us...>]

Revision: 136
          http://runnix.svn.sourceforge.net/runnix/?rev=136&view=rev
Author:   abelbeck
Date:     2010-12-17 17:20:11 +0000 (Fri, 17 Dec 2010)

Log Message:
-----------
Enable e2fsprogs package for disk repair

Modified Paths:
--------------
    branches/0.3/package/e2fsprogs/e2fsprogs.mk
    branches/0.3/runnix.config

Added Paths:
-----------
    branches/0.3/package/e2fsprogs/e2fsprogs-misc-static.patch

Added: branches/0.3/package/e2fsprogs/e2fsprogs-misc-static.patch
===================================================================
--- branches/0.3/package/e2fsprogs/e2fsprogs-misc-static.patch	                        (rev 0)
+++ branches/0.3/package/e2fsprogs/e2fsprogs-misc-static.patch	2010-12-17 17:20:11 UTC (rev 136)
@@ -0,0 +1,33 @@
+--- e2fsprogs-1.39/misc/Makefile.in.orig	2006-03-26 21:58:10.000000000 -0800
++++ e2fsprogs-1.39/misc/Makefile.in	2008-07-14 09:26:03.000000000 -0700
+@@ -85,6 +88,12 @@
+ 	@$(CC) $(ALL_LDFLAGS) -o tune2fs $(TUNE2FS_OBJS) $(LIBS) \
+ 		$(LIBS_BLKID) $(LIBS_E2P) $(LIBINTL)
+ 
++tune2fs.static: $(TUNE2FS_OBJS) $(STATIC_DEPLIBS) $(STATIC_LIBE2P) $(DEPSTATIC_LIBBLKID)
++	@echo "	LD $@"
++	@$(CC) $(ALL_LDFLAGS) -static -o tune2fs.static $(TUNE2FS_OBJS) \
++		$(STATIC_LIBS) $(STATIC_LIBBLKID) $(STATIC_LIBUUID) \
++		$(STATIC_LIBE2P) $(LIBINTL)
++
+ blkid: $(BLKID_OBJS) $(DEPLIBS_BLKID)
+ 	@echo "	LD $@"
+ 	@$(CC) $(ALL_LDFLAGS) -o blkid $(BLKID_OBJS) $(LIBS_BLKID) $(LIBINTL)
+@@ -349,6 +349,7 @@
+ 	$(RM) -f $(SPROGS) $(USPROGS) $(UPROGS) $(UMANPAGES) $(SMANPAGES) \
+ 		$(FMANPAGES) \
+ 		base_device base_device.out mke2fs.static filefrag \
++		tune2fs.static \
+ 		e2initrd_helper partinfo \#* *.s *.o *.a *~ core 
+ 
+ mostlyclean: clean
+--- e2fsprogs-1.39/MCONFIG.in.orig	2006-03-22 17:19:19.000000000 -0800
++++ e2fsprogs-1.39/MCONFIG.in	2008-07-14 09:52:10.000000000 -0700
+@@ -87,6 +87,7 @@
+ STATIC_LIBUUID = $(LIB)/libuuid@STATIC_LIB_EXT@ @SOCKET_LIB@ 
+ STATIC_LIBBLKID = $(LIB)/libblkid@STATIC_LIB_EXT@ $(STATIC_DEVMAPPER_LIBS)
+ DEPSTATIC_LIBUUID = $(LIB)/libuuid@STATIC_LIB_EXT@
++DEPSTATIC_LIBBLKID = $(LIB)/libblkid@STATIC_LIB_EXT@ $(STATIC_DEVMAPPER_LIBS)
+ 
+ PROFILED_LIBSS = $(LIB)/libss@PROFILED_LIB_EXT@
+ PROFILED_LIBCOM_ERR = $(LIB)/libcom_err@PROFILED_LIB_EXT@

Modified: branches/0.3/package/e2fsprogs/e2fsprogs.mk
===================================================================
--- branches/0.3/package/e2fsprogs/e2fsprogs.mk	2010-12-17 15:53:46 UTC (rev 135)
+++ branches/0.3/package/e2fsprogs/e2fsprogs.mk	2010-12-17 17:20:11 UTC (rev 136)
@@ -67,6 +67,15 @@
 	$(MAKE1) PATH=$(TARGET_PATH) DESTDIR=$(TARGET_DIR) -C $(E2FSPROGS_DIR) install
 	rm -rf $(TARGET_DIR)/share/locale $(TARGET_DIR)/usr/info \
 		$(TARGET_DIR)/usr/man $(TARGET_DIR)/usr/share/doc
+	$(STRIP) $(TARGET_DIR)/sbin/e2fsck
+	( \
+		cd $(TARGET_DIR)/sbin ; \
+		ln -sf e2fsck fsck.ext2 ; \
+		ln -sf mke2fs mkfs.ext2 ; \
+		ln -sf mke2fs mkfs.ext3 ; \
+		ln -sf tune2fs findfs ; \
+		ln -sf tune2fs e2label ; \
+	)
 	touch -c $(TARGET_DIR)/$(E2FSPROGS_TARGET_BINARY)
 
 e2fsprogs: uclibc $(TARGET_DIR)/$(E2FSPROGS_TARGET_BINARY)

Modified: branches/0.3/runnix.config
===================================================================
--- branches/0.3/runnix.config	2010-12-17 15:53:46 UTC (rev 135)
+++ branches/0.3/runnix.config	2010-12-17 17:20:11 UTC (rev 136)
@@ -139,7 +139,7 @@
 BR2_PACKAGE_DROPBEAR=y
 BR2_PACKAGE_DROPBEAR_URANDOM=y
 # BR2_PACKAGE_EXPAT is not set
-# BR2_PACKAGE_E2FSPROGS is not set
+BR2_PACKAGE_E2FSPROGS=y
 # BR2_PACKAGE_FAKEROOT is not set
 BR2_HOST_FAKEROUTE=y
 # BR2_PACKAGE_FILE is not set


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