[Astlinux-commits] SF.net SVN: astlinux:[6046] branches/1.0

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

Revision: 6046
          http://sourceforge.net/p/astlinux/code/6046
Author:   abelbeck
Date:     2013-04-16 15:46:02 +0000 (Tue, 16 Apr 2013)
Log Message:
-----------
e2fsprogs, remove FINDFS option, build findfs with util-linux, and now with --disable-libblkid findfs is not built in e2fsprogs

Modified Paths:
--------------
    branches/1.0/astlinux-ast11.config
    branches/1.0/astlinux.config
    branches/1.0/astlinux18.config
    branches/1.0/initrd.config
    branches/1.0/package/e2fsprogs/Config.in
    branches/1.0/package/e2fsprogs/e2fsprogs.mk
    branches/1.0/runnix.config

Modified: branches/1.0/astlinux-ast11.config
===================================================================
--- branches/1.0/astlinux-ast11.config	2013-04-16 07:06:40 UTC (rev 6045)
+++ branches/1.0/astlinux-ast11.config	2013-04-16 15:46:02 UTC (rev 6046)
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Buildroot 2011.08-svn6044-dirty Configuration
-# Tue Apr 16 01:56:34 2013
+# Buildroot 2011.08-svn6045-dirty Configuration
+# Tue Apr 16 10:39:53 2013
 #
 BR2_HAVE_DOT_CONFIG=y
 # BR2_arm is not set
@@ -347,7 +347,6 @@
 BR2_PACKAGE_E2FSPROGS_E2LABEL=y
 BR2_PACKAGE_E2FSPROGS_E2UNDO=y
 BR2_PACKAGE_E2FSPROGS_FILEFRAG=y
-# BR2_PACKAGE_E2FSPROGS_FINDFS is not set
 BR2_PACKAGE_E2FSPROGS_FSCK=y
 BR2_PACKAGE_E2FSPROGS_LOGSAVE=y
 BR2_PACKAGE_E2FSPROGS_LSATTR=y

Modified: branches/1.0/astlinux.config
===================================================================
--- branches/1.0/astlinux.config	2013-04-16 07:06:40 UTC (rev 6045)
+++ branches/1.0/astlinux.config	2013-04-16 15:46:02 UTC (rev 6046)
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Buildroot 2011.08-svn6044-dirty Configuration
-# Tue Apr 16 01:56:33 2013
+# Buildroot 2011.08-svn6045-dirty Configuration
+# Tue Apr 16 10:39:52 2013
 #
 BR2_HAVE_DOT_CONFIG=y
 # BR2_arm is not set
@@ -353,7 +353,6 @@
 BR2_PACKAGE_E2FSPROGS_E2LABEL=y
 BR2_PACKAGE_E2FSPROGS_E2UNDO=y
 BR2_PACKAGE_E2FSPROGS_FILEFRAG=y
-# BR2_PACKAGE_E2FSPROGS_FINDFS is not set
 BR2_PACKAGE_E2FSPROGS_FSCK=y
 BR2_PACKAGE_E2FSPROGS_LOGSAVE=y
 BR2_PACKAGE_E2FSPROGS_LSATTR=y

Modified: branches/1.0/astlinux18.config
===================================================================
--- branches/1.0/astlinux18.config	2013-04-16 07:06:40 UTC (rev 6045)
+++ branches/1.0/astlinux18.config	2013-04-16 15:46:02 UTC (rev 6046)
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Buildroot 2011.08-svn6044-dirty Configuration
-# Tue Apr 16 01:56:33 2013
+# Buildroot 2011.08-svn6045-dirty Configuration
+# Tue Apr 16 10:39:52 2013
 #
 BR2_HAVE_DOT_CONFIG=y
 # BR2_arm is not set
@@ -347,7 +347,6 @@
 BR2_PACKAGE_E2FSPROGS_E2LABEL=y
 BR2_PACKAGE_E2FSPROGS_E2UNDO=y
 BR2_PACKAGE_E2FSPROGS_FILEFRAG=y
-# BR2_PACKAGE_E2FSPROGS_FINDFS is not set
 BR2_PACKAGE_E2FSPROGS_FSCK=y
 BR2_PACKAGE_E2FSPROGS_LOGSAVE=y
 BR2_PACKAGE_E2FSPROGS_LSATTR=y

Modified: branches/1.0/initrd.config
===================================================================
--- branches/1.0/initrd.config	2013-04-16 07:06:40 UTC (rev 6045)
+++ branches/1.0/initrd.config	2013-04-16 15:46:02 UTC (rev 6046)
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Buildroot 2011.08-svn6044-dirty Configuration
-# Tue Apr 16 01:56:35 2013
+# Buildroot 2011.08-svn6045-dirty Configuration
+# Tue Apr 16 10:39:54 2013
 #
 BR2_HAVE_DOT_CONFIG=y
 # BR2_arm is not set
@@ -321,7 +321,6 @@
 # BR2_PACKAGE_E2FSPROGS_E2LABEL is not set
 # BR2_PACKAGE_E2FSPROGS_E2UNDO is not set
 # BR2_PACKAGE_E2FSPROGS_FILEFRAG is not set
-# BR2_PACKAGE_E2FSPROGS_FINDFS is not set
 # BR2_PACKAGE_E2FSPROGS_FSCK is not set
 # BR2_PACKAGE_E2FSPROGS_LOGSAVE is not set
 # BR2_PACKAGE_E2FSPROGS_LSATTR is not set

Modified: branches/1.0/package/e2fsprogs/Config.in
===================================================================
--- branches/1.0/package/e2fsprogs/Config.in	2013-04-16 07:06:40 UTC (rev 6045)
+++ branches/1.0/package/e2fsprogs/Config.in	2013-04-16 15:46:02 UTC (rev 6046)
@@ -51,11 +51,6 @@
 	bool "filefrag"
 	default y
 
-config BR2_PACKAGE_E2FSPROGS_FINDFS
-	bool "findfs"
-	default y
-	select BR2_PACKAGE_E2FSPROGS_E2LABEL
-
 config BR2_PACKAGE_E2FSPROGS_FSCK
 	bool "fsck"
 	default y

Modified: branches/1.0/package/e2fsprogs/e2fsprogs.mk
===================================================================
--- branches/1.0/package/e2fsprogs/e2fsprogs.mk	2013-04-16 07:06:40 UTC (rev 6045)
+++ branches/1.0/package/e2fsprogs/e2fsprogs.mk	2013-04-16 15:46:02 UTC (rev 6046)
@@ -51,7 +51,6 @@
 	usr/sbin/mkfs.ext4dev \
 	usr/sbin/fsck.ext[234] \
 	usr/sbin/fsck.ext4dev \
-	usr/sbin/findfs \
 	usr/sbin/tune2fs
 
 define E2FSPROGS_TARGET_REMOVE_UNNEEDED
@@ -91,13 +90,5 @@
 E2FSPROGS_POST_INSTALL_TARGET_HOOKS += E2FSPROGS_TARGET_TUNE2FS_SYMLINK
 endif
 
-define E2FSPROGS_TARGET_FINDFS_SYMLINK
-	ln -sf e2label $(TARGET_DIR)/usr/sbin/findfs
-endef
-
-ifeq ($(BR2_PACKAGE_E2FSPROGS_FINDFS),y)
-E2FSPROGS_POST_INSTALL_TARGET_HOOKS += E2FSPROGS_TARGET_FINDFS_SYMLINK
-endif
-
 $(eval $(call AUTOTARGETS,package,e2fsprogs))
 $(eval $(call AUTOTARGETS,package,e2fsprogs,host))

Modified: branches/1.0/runnix.config
===================================================================
--- branches/1.0/runnix.config	2013-04-16 07:06:40 UTC (rev 6045)
+++ branches/1.0/runnix.config	2013-04-16 15:46:02 UTC (rev 6046)
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Buildroot 2011.08-svn6044-dirty Configuration
-# Tue Apr 16 01:56:34 2013
+# Buildroot 2011.08-svn6045-dirty Configuration
+# Tue Apr 16 10:39:53 2013
 #
 BR2_HAVE_DOT_CONFIG=y
 # BR2_arm is not set
@@ -342,7 +342,6 @@
 BR2_PACKAGE_E2FSPROGS_E2LABEL=y
 BR2_PACKAGE_E2FSPROGS_E2UNDO=y
 BR2_PACKAGE_E2FSPROGS_FILEFRAG=y
-# BR2_PACKAGE_E2FSPROGS_FINDFS is not set
 BR2_PACKAGE_E2FSPROGS_FSCK=y
 BR2_PACKAGE_E2FSPROGS_LOGSAVE=y
 BR2_PACKAGE_E2FSPROGS_LSATTR=y

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