Update of /cvsroot/leaf/src/bering-uclibc/apps/e2fsprogs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11113
Modified Files:
buildtool.cfg buildtool.mk
Added Files:
checkfs.sh
Log Message:
cleanups, added a filesystem check script for mounted ext2/ext3 filesystems,
reordered directories and symlinks and linked e2fsck dynamic
Index: buildtool.cfg
===================================================================
RCS file: /cvsroot/leaf/src/bering-uclibc/apps/e2fsprogs/buildtool.cfg,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** buildtool.cfg 18 Oct 2004 13:16:38 -0000 1.4
--- buildtool.cfg 26 Jan 2006 20:54:37 -0000 1.5
***************
*** 18,19 ****
--- 18,25 ----
envname = E2FSPROGS_PATCH1
</File>
+
+ <File checkfs.sh>
+ Server = cvs-sourceforge
+ Revision=HEAD
+ Directory = e2fsprogs
+ </File>
Index: buildtool.mk
===================================================================
RCS file: /cvsroot/leaf/src/bering-uclibc/apps/e2fsprogs/buildtool.mk,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** buildtool.mk 30 Oct 2004 20:17:08 -0000 1.5
--- buildtool.mk 26 Jan 2006 20:54:37 -0000 1.6
***************
*** 16,20 ****
$(E2FSPROGS_DIR)/.configured: $(E2FSPROGS_DIR)/.source
! (cd $(E2FSPROGS_DIR) && CC=$(TARGET_CC) ./configure --prefix=/usr/
--with-ccopts="$(BT_COPT_FLAGS)" --with-ldopts=-s )
touch $(E2FSPROGS_DIR)/.configured
--- 16,33 ----
$(E2FSPROGS_DIR)/.configured: $(E2FSPROGS_DIR)/.source
! (cd $(E2FSPROGS_DIR) && CC=$(TARGET_CC) \
! ./configure \
! --prefix=/ \
! --with-cc=$(TARGET_CC) \
! --with-linker=$(TARGET_LD) \
! --with-ccopts="$(BT_COPT_FLAGS)" \
! --with-ldopts=-s \
! --enable-dynamic-e2fsck \
! --disable-swapfs \
! --disable-imager \
! --disable-resizer \
! --disable-debugfs \
! --build=$(GNU_HOST_NAME) \
! --host=$(GNU_HOST_NAME) )
touch $(E2FSPROGS_DIR)/.configured
***************
*** 23,54 ****
build: $(E2FSPROGS_DIR)/.configured
-mkdir $(E2FSPROGS_TARGET_DIR)
$(MAKE) CC=$(TARGET_CC) -C $(E2FSPROGS_DIR)
! $(MAKE) CC=$(TARGET_CC) DESTDIR=$(E2FSPROGS_TARGET_DIR) -C
$(E2FSPROGS_DIR) install
! -$(BT_STRIP) -s --remove-section=.note --remove-section=.comment
$(E2FSPROGS_TARGET_DIR)/usr/sbin/mke2fs
! -$(BT_STRIP) -s --remove-section=.note --remove-section=.comment
$(E2FSPROGS_TARGET_DIR)/usr/sbin/tune2fs
! -$(BT_STRIP) -s --remove-section=.note --remove-section=.comment
$(E2FSPROGS_TARGET_DIR)/usr/sbin/badblocks
! -$(BT_STRIP) -s --remove-section=.note --remove-section=.comment
$(E2FSPROGS_TARGET_DIR)/usr/sbin/e2fsck
! -$(BT_STRIP) -s --remove-section=.note --remove-section=.comment
$(E2FSPROGS_TARGET_DIR)/usr/sbin/e2label
! -$(BT_STRIP) -s --remove-section=.note --remove-section=.comment
$(E2FSPROGS_TARGET_DIR)/usr/sbin/e2fsck
! mkdir -p $(BT_STAGING_DIR)/usr/sbin
! -cp $(E2FSPROGS_TARGET_DIR)/usr/sbin/mke2fs $(BT_STAGING_DIR)/usr/sbin/
! -cp $(E2FSPROGS_TARGET_DIR)/usr/sbin/tune2fs
$(BT_STAGING_DIR)/usr/sbin/
! -cp $(E2FSPROGS_TARGET_DIR)/usr/sbin/badblocks
$(BT_STAGING_DIR)/usr/sbin/
! -cp $(E2FSPROGS_TARGET_DIR)/usr/sbin/e2fsck $(BT_STAGING_DIR)/usr/sbin/
! -cp $(E2FSPROGS_TARGET_DIR)/usr/sbin/e2label
$(BT_STAGING_DIR)/usr/sbin/
! -cp $(E2FSPROGS_TARGET_DIR)/usr/sbin/e2fsck $(BT_STAGING_DIR)/usr/sbin/
!
clean:
rm -rf $(E2FSPROGS_TARGET_DIR)
$(MAKE) -C $(E2FSPROGS_DIR) clean
! -rm $(BT_STAGING_DIR)/usr/sbin/mke2fs
! -rm $(BT_STAGING_DIR)/usr/sbin/tune2fs
! -rm $(BT_STAGING_DIR)/usr/sbin/badblocks
! -rm $(BT_STAGING_DIR)/usr/sbin/e2fsck
! -rm $(BT_STAGING_DIR)/usr/sbin/e2label
! -rm $(BT_STAGING_DIR)/usr/sbin/e2fsck
srcclean:
rm -rf $(E2FSPROGS_DIR)
-
-
--- 36,65 ----
build: $(E2FSPROGS_DIR)/.configured
-mkdir $(E2FSPROGS_TARGET_DIR)
+ mkdir -p $(E2FSPROGS_TARGET_DIR)/sbin
+ mkdir -p $(E2FSPROGS_TARGET_DIR)/etc/init.d
$(MAKE) CC=$(TARGET_CC) -C $(E2FSPROGS_DIR)
! cp -a $(E2FSPROGS_DIR)/misc/mke2fs $(E2FSPROGS_TARGET_DIR)/sbin/
! cp -a $(E2FSPROGS_DIR)/misc/tune2fs $(E2FSPROGS_TARGET_DIR)/sbin/
! cp -a $(E2FSPROGS_DIR)/misc/badblocks $(E2FSPROGS_TARGET_DIR)/sbin/
! cp -a $(E2FSPROGS_DIR)/misc/fsck $(E2FSPROGS_TARGET_DIR)/sbin/
! cp -a $(E2FSPROGS_DIR)/e2fsck/e2fsck $(E2FSPROGS_TARGET_DIR)/sbin/
! cp -a checkfs.sh $(E2FSPROGS_TARGET_DIR)/etc/init.d/
! -$(BT_STRIP) $(BT_STRIP_BINOPTS) $(E2FSPROGS_TARGET_DIR)/sbin/*
! cp -a $(E2FSPROGS_TARGET_DIR)/* $(BT_STAGING_DIR)
! touch $(E2FSPROGS_DIR)/.build
!
clean:
rm -rf $(E2FSPROGS_TARGET_DIR)
$(MAKE) -C $(E2FSPROGS_DIR) clean
! rm -rf $(E2FSPROGS_DIR)/.build
! rm -rf $(E2FSPROGS_DIR)/.configured
! -rm $(BT_STAGING_DIR)/sbin/mke2fs
! -rm $(BT_STAGING_DIR)/sbin/tune2fs
! -rm $(BT_STAGING_DIR)/sbin/badblocks
! -rm $(BT_STAGING_DIR)/sbin/e2fsck
! -rm $(BT_STAGING_DIR)/sbin/e2label
! -rm $(BT_STAGING_DIR)/sbin/e2fsck
! -rm $(BT_STAGING_DIR)/sbin/fsck
srcclean:
rm -rf $(E2FSPROGS_DIR)
--- NEW FILE: checkfs.sh ---
#
# checkfs.sh Check all filesystems.
#
# Version: @(#)checkfs 2.85-13 22-Mar-2004 [EMAIL PROTECTED]
#
RCDLINKS="S,S30"
FSCKFIX=no
FSCKFORCE=no
#
# Check the file systems.
#
if [ "$FSCKFIX" = yes ]
then
fix="-y"
else
fix="-a"
fi
if [ "$FSCKFORCE" = yes ]
then
force="-f"
else
force=""
fi
spinner="-C"
case "$TERM" in
dumb|network|unknown|"") spinner="" ;;
esac
echo "Checking all file systems..."
fsck $spinner -R -A $fix $force
if [ $? -gt 1 ]
then
echo
echo "fsck failed. Please repair manually."
echo
echo "CONTROL-D will exit from this shell and continue system startup."
echo
# Start a single user shell on the console
/sbin/sulogin $CONSOLE
fi
: exit 0
-------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
for problems? Stop! Download the new AJAX search engine that makes
searching your log files as easy as surfing the web. DOWNLOAD SPLUNK!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=103432&bid=230486&dat=121642
_______________________________________________
leaf-cvs-commits mailing list
leaf-cvs-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/leaf-cvs-commits
