forked from pool/e2fsprogs
Rev openSUSE:Factory/31 Md5 5ca6e838699ae1878e2a9801650c5426 2008-07-18 19:53:07 unknown None
This commit is contained in:
parent
74c9f7fbed
commit
bf1b5f45b8
4
.gitattributes
vendored
4
.gitattributes
vendored
@ -20,4 +20,6 @@
|
||||
*.whl filter=lfs diff=lfs merge=lfs -text
|
||||
*.xz filter=lfs diff=lfs merge=lfs -text
|
||||
*.zip filter=lfs diff=lfs merge=lfs -text
|
||||
*.zst filter=lfs diff=lfs merge=lfs -text
|
||||
*.zst filter=lfs diff=lfs merge=lfs -text
|
||||
## Specific LFS patterns
|
||||
e2fsprogs-no_cmd_hiding.patch filter=lfs diff=lfs merge=lfs -text
|
||||
|
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:9cb28087c64794a351f2f7c50e9bdb54549a36cbaddd53beb67ac4bb7f5ae310
|
||||
size 3665533
|
26
e2fsprogs-1.41.0-tst_link_fix.patch
Normal file
26
e2fsprogs-1.41.0-tst_link_fix.patch
Normal file
@ -0,0 +1,26 @@
|
||||
Index: e2fsprogs-1.41.0/e2fsck/Makefile.in
|
||||
===================================================================
|
||||
--- e2fsprogs-1.41.0.orig/e2fsck/Makefile.in 2008-06-19 17:57:59.000000000 +0200
|
||||
+++ e2fsprogs-1.41.0/e2fsck/Makefile.in 2008-07-11 15:19:01.000000000 +0200
|
||||
@@ -138,7 +138,7 @@ crc32table.h: gen_crc32table
|
||||
|
||||
tst_crc32: $(srcdir)/crc32.c $(LIBEXT2FS)
|
||||
@$(CC) $(BUILD_LDFLAGS) $(ALL_CFLAGS) -o tst_crc32 $(srcdir)/crc32.c \
|
||||
- -DUNITTEST $(LIBEXT2FS)
|
||||
+ -DUNITTEST $(LIBEXT2FS) $(LIBCOM_ERR)
|
||||
|
||||
tst_refcount: ea_refcount.c
|
||||
@echo " LD $@"
|
||||
@@ -151,9 +151,9 @@ tst_region: region.c
|
||||
$(ALL_CFLAGS) -DTEST_PROGRAM $(LIBCOM_ERR)
|
||||
|
||||
check:: tst_refcount tst_region tst_crc32
|
||||
- ./tst_refcount
|
||||
- ./tst_region
|
||||
- ./tst_crc32
|
||||
+ LD_LIBRARY_PATH=$(top_builddir)/lib ./tst_refcount
|
||||
+ LD_LIBRARY_PATH=$(top_builddir)/lib ./tst_region
|
||||
+ LD_LIBRARY_PATH=$(top_builddir)/lib ./tst_crc32
|
||||
|
||||
extend: extend.o
|
||||
@echo " LD $@"
|
3
e2fsprogs-1.41.0.tar.bz2
Normal file
3
e2fsprogs-1.41.0.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:d917cc9e6153f644ed91b0a5af6a3a10c47712d2335fd0dd6fcaa7088e612fc2
|
||||
size 3823614
|
@ -1,786 +1,3 @@
|
||||
Index: e2fsprogs-1.40.7/lib/Makefile.elf-lib
|
||||
===================================================================
|
||||
--- e2fsprogs-1.40.7.orig/lib/Makefile.elf-lib
|
||||
+++ e2fsprogs-1.40.7/lib/Makefile.elf-lib
|
||||
@@ -15,7 +15,7 @@ all:: image
|
||||
|
||||
real-subdirs:: Makefile
|
||||
@echo " MKDIR elfshared"
|
||||
- @mkdir -p elfshared
|
||||
+ mkdir -p elfshared
|
||||
|
||||
ELF_LIB = $(ELF_IMAGE).so.$(ELF_VERSION)
|
||||
ELF_SONAME = $(ELF_IMAGE).so.$(ELF_SO_VERSION)
|
||||
Index: e2fsprogs-1.40.7/lib/ext2fs/Makefile.in
|
||||
===================================================================
|
||||
--- e2fsprogs-1.40.7.orig/lib/ext2fs/Makefile.in
|
||||
+++ e2fsprogs-1.40.7/lib/ext2fs/Makefile.in
|
||||
@@ -164,12 +164,11 @@ BSDLIB_INSTALL_DIR = $(root_libdir)
|
||||
all:: ext2fs.pc
|
||||
|
||||
.c.o:
|
||||
- @echo " CC $<"
|
||||
- @$(CC) $(ALL_CFLAGS) -c $< -o $@
|
||||
-@PROFILE_CMT@ @$(CC) $(ALL_CFLAGS) -g -pg -o profiled/$*.o -c $<
|
||||
-@CHECKER_CMT@ @$(CC) $(ALL_CFLAGS) -checker -g -o checker/$*.o -c $<
|
||||
-@ELF_CMT@ @$(CC) $(ALL_CFLAGS) -fPIC -o elfshared/$*.o -c $<
|
||||
-@BSDLIB_CMT@ @$(CC) $(ALL_CFLAGS) $(BSDLIB_PIC_FLAG) -o pic/$*.o -c $<
|
||||
+ $(CC) $(ALL_CFLAGS) -c $< -o $@
|
||||
+@PROFILE_CMT@ $(CC) $(ALL_CFLAGS) -g -pg -o profiled/$*.o -c $<
|
||||
+@CHECKER_CMT@ $(CC) $(ALL_CFLAGS) -checker -g -o checker/$*.o -c $<
|
||||
+@ELF_CMT@ $(CC) $(ALL_CFLAGS) -fPIC -o elfshared/$*.o -c $<
|
||||
+@BSDLIB_CMT@ $(CC) $(ALL_CFLAGS) $(BSDLIB_PIC_FLAG) -o pic/$*.o -c $<
|
||||
|
||||
COMPILE_ET=../et/compile_et --build-tree
|
||||
|
||||
@@ -189,61 +188,49 @@ ext2fs.pc: $(srcdir)/ext2fs.pc.in $(top_
|
||||
|
||||
tst_badblocks: tst_badblocks.o freefs.o \
|
||||
read_bb_file.o write_bb_file.o badblocks.o
|
||||
- @echo " LD $@"
|
||||
- @$(CC) -o tst_badblocks tst_badblocks.o freefs.o \
|
||||
+ $(CC) -o tst_badblocks tst_badblocks.o freefs.o \
|
||||
read_bb_file.o write_bb_file.o badblocks.o \
|
||||
inline.o bitops.o gen_bitmap.o $(LIBCOM_ERR)
|
||||
|
||||
tst_icount: icount.c initialize.o $(STATIC_LIBEXT2FS)
|
||||
- @echo " LD $@"
|
||||
- @$(CC) -o tst_icount $(srcdir)/icount.c initialize.o \
|
||||
+ $(CC) -o tst_icount $(srcdir)/icount.c initialize.o \
|
||||
-DDEBUG $(ALL_CFLAGS) \
|
||||
$(STATIC_LIBEXT2FS) $(LIBCOM_ERR)
|
||||
|
||||
tst_iscan: tst_iscan.o inode.o badblocks.o test_io.o $(STATIC_LIBEXT2FS)
|
||||
- @echo " LD $@"
|
||||
- @$(CC) -o tst_iscan tst_iscan.o inode.o badblocks.o test_io.o \
|
||||
+ $(CC) -o tst_iscan tst_iscan.o inode.o badblocks.o test_io.o \
|
||||
$(STATIC_LIBEXT2FS) $(LIBCOM_ERR)
|
||||
|
||||
tst_getsize: tst_getsize.o getsize.o $(STATIC_LIBEXT2FS)
|
||||
- @echo " LD $@"
|
||||
- @$(CC) -o tst_getsize tst_getsize.o getsize.o $(STATIC_LIBEXT2FS) \
|
||||
+ $(CC) -o tst_getsize tst_getsize.o getsize.o $(STATIC_LIBEXT2FS) \
|
||||
$(LIBCOM_ERR)
|
||||
|
||||
tst_ismounted: $(srcdir)/ismounted.c $(STATIC_LIBEXT2FS)
|
||||
- @echo " LD $@"
|
||||
- @$(CC) -o tst_ismounted $(srcdir)/ismounted.c -DDEBUG $(ALL_CFLAGS) $(LIBCOM_ERR)
|
||||
+ $(CC) -o tst_ismounted $(srcdir)/ismounted.c -DDEBUG $(ALL_CFLAGS) $(LIBCOM_ERR)
|
||||
|
||||
tst_byteswap: tst_byteswap.o bitops.o $(STATIC_LIBEXT2FS)
|
||||
- @echo " LD $@"
|
||||
- @$(CC) -o tst_byteswap tst_byteswap.o bitops.o $(STATIC_LIBEXT2FS) \
|
||||
+ $(CC) -o tst_byteswap tst_byteswap.o bitops.o $(STATIC_LIBEXT2FS) \
|
||||
$(LIBCOM_ERR)
|
||||
|
||||
tst_bitops: tst_bitops.o inline.o $(STATIC_LIBEXT2FS)
|
||||
- @echo " LD $@"
|
||||
- @$(CC) -o tst_bitops tst_bitops.o inline.o $(ALL_CFLAGS) \
|
||||
+ $(CC) -o tst_bitops tst_bitops.o inline.o $(ALL_CFLAGS) \
|
||||
$(STATIC_LIBEXT2FS) $(LIBCOM_ERR)
|
||||
|
||||
tst_getsectsize: tst_getsectsize.o getsectsize.o $(STATIC_LIBEXT2FS)
|
||||
- @echo " LD $@"
|
||||
- @$(CC) -o tst_sectgetsize tst_getsectsize.o getsectsize.o \
|
||||
+ $(CC) -o tst_sectgetsize tst_getsectsize.o getsectsize.o \
|
||||
$(STATIC_LIBEXT2FS) $(LIBCOM_ERR)
|
||||
|
||||
tst_types: tst_types.o ext2_types.h
|
||||
- @echo " LD $@"
|
||||
- @$(CC) -o tst_types tst_types.o
|
||||
+ $(CC) -o tst_types tst_types.o
|
||||
|
||||
tst_super_size: tst_super_size.o ext2_fs.h
|
||||
- @echo " LD $@"
|
||||
- @$(CC) -o tst_super_size tst_super_size.o
|
||||
+ $(CC) -o tst_super_size tst_super_size.o
|
||||
|
||||
ext2_tdbtool: tdbtool.o
|
||||
- @echo " LD $@"
|
||||
- @$(CC) -o ext2_tdbtool tdbtool.o tdb.o
|
||||
+ $(CC) -o ext2_tdbtool tdbtool.o tdb.o
|
||||
|
||||
mkjournal: mkjournal.c $(STATIC_LIBEXT2FS)
|
||||
- @echo " LD $@"
|
||||
- @$(CC) -o mkjournal $(srcdir)/mkjournal.c -DDEBUG $(STATIC_LIBEXT2FS) $(LIBCOM_ERR) $(ALL_CFLAGS)
|
||||
+ $(CC) -o mkjournal $(srcdir)/mkjournal.c -DDEBUG $(STATIC_LIBEXT2FS) $(LIBCOM_ERR) $(ALL_CFLAGS)
|
||||
|
||||
check:: tst_bitops tst_badblocks tst_iscan @SWAPFS_CMT@ tst_byteswap \
|
||||
tst_types tst_icount tst_super_size
|
||||
@@ -256,13 +243,11 @@ check:: tst_bitops tst_badblocks tst_isc
|
||||
LD_LIBRARY_PATH=$(LIB) DYLD_LIBRARY_PATH=$(LIB) ./tst_super_size
|
||||
|
||||
installdirs::
|
||||
- @echo " MKINSTALLDIRS $(libdir) $(includedir)/ext2fs"
|
||||
- @$(MKINSTALLDIRS) $(DESTDIR)$(libdir) \
|
||||
+ $(MKINSTALLDIRS) $(DESTDIR)$(libdir) \
|
||||
$(DESTDIR)$(includedir)/ext2fs $(DESTDIR)$(libdir)/pkgconfig
|
||||
|
||||
install:: all $(HFILES) $(HFILES_IN) installdirs ext2fs.pc
|
||||
- @echo " INSTALL_DATA $(libdir)/libext2fs.a"
|
||||
- @$(INSTALL_DATA) libext2fs.a $(DESTDIR)$(libdir)/libext2fs.a
|
||||
+ $(INSTALL_DATA) libext2fs.a $(DESTDIR)$(libdir)/libext2fs.a
|
||||
@-$(RANLIB) $(DESTDIR)$(libdir)/libext2fs.a
|
||||
@$(CHMOD) $(LIBMODE) $(DESTDIR)$(libdir)/libext2fs.a
|
||||
@for i in $(HFILES); do \
|
||||
Index: e2fsprogs-1.40.7/lib/blkid/Makefile.in
|
||||
===================================================================
|
||||
--- e2fsprogs-1.40.7.orig/lib/blkid/Makefile.in
|
||||
+++ e2fsprogs-1.40.7/lib/blkid/Makefile.in
|
||||
@@ -54,8 +54,7 @@ LIBS_BLKID= $(STATIC_LIBBLKID) $(STATIC_
|
||||
DEPLIBS_BLKID= $(DEPSTATIC_LIBBLKID) $(DEPSTATIC_LIBUUID)
|
||||
|
||||
.c.o:
|
||||
- @echo " CC $<"
|
||||
- @$(CC) $(ALL_CFLAGS) -c $< -o $@
|
||||
+ $(CC) $(ALL_CFLAGS) -c $< -o $@
|
||||
@PROFILE_CMT@ @$(CC) $(ALL_CFLAGS) -g -pg -o profiled/$*.o -c $<
|
||||
@CHECKER_CMT@ @$(CC) $(ALL_CFLAGS) -checker -g -o checker/$*.o -c $<
|
||||
@ELF_CMT@ @$(CC) $(ALL_CFLAGS) -fPIC -o elfshared/$*.o -c $<
|
||||
@@ -73,57 +72,44 @@ libblkid.3: $(DEP_SUBSTITUTE) $(srcdir)/
|
||||
@$(SUBSTITUTE_UPTIME) $(srcdir)/libblkid.3.in libblkid.3
|
||||
|
||||
tst_cache: $(srcdir)/cache.c $(DEPLIBS_BLKID)
|
||||
- @echo " LD $@"
|
||||
- @$(CC) -o tst_cache -DTEST_PROGRAM $(srcdir)/cache.c $(LIBS_BLKID) $(ALL_CFLAGS)
|
||||
+ $(CC) -o tst_cache -DTEST_PROGRAM $(srcdir)/cache.c $(LIBS_BLKID) $(ALL_CFLAGS)
|
||||
|
||||
tst_dev: $(srcdir)/dev.c $(DEPLIBS_BLKID)
|
||||
- @echo " LD $@"
|
||||
- @$(CC) -o tst_dev -DTEST_PROGRAM $(srcdir)/dev.c $(LIBS_BLKID) $(ALL_CFLAGS)
|
||||
+ $(CC) -o tst_dev -DTEST_PROGRAM $(srcdir)/dev.c $(LIBS_BLKID) $(ALL_CFLAGS)
|
||||
|
||||
tst_devname: $(srcdir)/devname.c $(DEPLIBS_BLKID)
|
||||
- @echo " LD $@"
|
||||
- @$(CC) -o tst_devname -DTEST_PROGRAM $(srcdir)/devname.c $(LIBS_BLKID) $(ALL_CFLAGS)
|
||||
+ $(CC) -o tst_devname -DTEST_PROGRAM $(srcdir)/devname.c $(LIBS_BLKID) $(ALL_CFLAGS)
|
||||
|
||||
tst_devno: $(srcdir)/devno.c $(DEPLIBS_BLKID)
|
||||
- @echo " LD $@"
|
||||
- @$(CC) -o tst_devno -DTEST_PROGRAM $(srcdir)/devno.c $(LIBS_BLKID) $(ALL_CFLAGS)
|
||||
+ $(CC) -o tst_devno -DTEST_PROGRAM $(srcdir)/devno.c $(LIBS_BLKID) $(ALL_CFLAGS)
|
||||
|
||||
tst_getsize: $(srcdir)/getsize.c $(DEPLIBS_BLKID)
|
||||
- @echo " LD $@"
|
||||
- @$(CC) -o tst_getsize -DTEST_PROGRAM $(srcdir)/getsize.c $(LIBS_BLKID) $(ALL_CFLAGS)
|
||||
+ $(CC) -o tst_getsize -DTEST_PROGRAM $(srcdir)/getsize.c $(LIBS_BLKID) $(ALL_CFLAGS)
|
||||
|
||||
tst_probe: $(srcdir)/probe.c $(DEPLIBS_BLKID)
|
||||
- @echo " LD $@"
|
||||
- @$(CC) -o tst_probe -DTEST_PROGRAM $(srcdir)/probe.c $(LIBS_BLKID) $(ALL_CFLAGS)
|
||||
+ $(CC) -o tst_probe -DTEST_PROGRAM $(srcdir)/probe.c $(LIBS_BLKID) $(ALL_CFLAGS)
|
||||
|
||||
tst_read: $(srcdir)/read.c $(DEPLIBS_BLKID)
|
||||
- @echo " LD $@"
|
||||
- @$(CC) -o tst_read -DTEST_PROGRAM $(srcdir)/read.c $(LIBS_BLKID) $(ALL_CFLAGS)
|
||||
+ $(CC) -o tst_read -DTEST_PROGRAM $(srcdir)/read.c $(LIBS_BLKID) $(ALL_CFLAGS)
|
||||
|
||||
tst_resolve: $(srcdir)/resolve.c $(DEPLIBS_BLKID)
|
||||
- @echo " LD $@"
|
||||
- @$(CC) -o tst_resolve -DTEST_PROGRAM $(srcdir)/resolve.c $(LIBS_BLKID) $(ALL_CFLAGS)
|
||||
+ $(CC) -o tst_resolve -DTEST_PROGRAM $(srcdir)/resolve.c $(LIBS_BLKID) $(ALL_CFLAGS)
|
||||
|
||||
tst_save: $(srcdir)/save.c $(DEPLIBS_BLKID)
|
||||
- @echo " LD $@"
|
||||
- @$(CC) -o tst_save -DTEST_PROGRAM $(srcdir)/save.c $(LIBS_BLKID) $(ALL_CFLAGS)
|
||||
+ $(CC) -o tst_save -DTEST_PROGRAM $(srcdir)/save.c $(LIBS_BLKID) $(ALL_CFLAGS)
|
||||
|
||||
tst_tag: $(srcdir)/tag.c $(DEPLIBS_BLKID)
|
||||
- @echo " LD $@"
|
||||
- @$(CC) -o tst_tag -DTEST_PROGRAM $(srcdir)/tag.c $(LIBS_BLKID) $(ALL_CFLAGS)
|
||||
+ $(CC) -o tst_tag -DTEST_PROGRAM $(srcdir)/tag.c $(LIBS_BLKID) $(ALL_CFLAGS)
|
||||
|
||||
tst_types: tst_types.o blkid_types.h
|
||||
- @echo " LD $@"
|
||||
- @$(CC) -o tst_types tst_types.o
|
||||
+ $(CC) -o tst_types tst_types.o
|
||||
|
||||
../../misc/blkid.o: $(top_srcdir)/misc/blkid.c blkid.h
|
||||
- @echo " CC $@"
|
||||
- @$(CC) $(ALL_CFLAGS) -c $(top_srcdir)/misc/blkid.c \
|
||||
+ $(CC) $(ALL_CFLAGS) -c $(top_srcdir)/misc/blkid.c \
|
||||
-o ../../misc/blkid.o
|
||||
|
||||
blkid: ../../misc/blkid.o libblkid.a $(DEPLIBUUID)
|
||||
- @echo " LD $@"
|
||||
- @$(CC) -o blkid ../../misc/blkid.o libblkid.a $(LIBUUID)
|
||||
+ $(CC) -o blkid ../../misc/blkid.o libblkid.a $(LIBUUID)
|
||||
|
||||
test_probe: test_probe.in Makefile
|
||||
@echo "Creating test_probe..."
|
||||
Index: e2fsprogs-1.40.7/lib/e2p/Makefile.in
|
||||
===================================================================
|
||||
--- e2fsprogs-1.40.7.orig/lib/e2p/Makefile.in
|
||||
+++ e2fsprogs-1.40.7/lib/e2p/Makefile.in
|
||||
@@ -53,8 +53,7 @@ BSDLIB_INSTALL_DIR = $(root_libdir)
|
||||
@MAKEFILE_CHECKER@
|
||||
|
||||
.c.o:
|
||||
- @echo " CC $<"
|
||||
- @$(CC) $(ALL_CFLAGS) -c $< -o $@
|
||||
+ $(CC) $(ALL_CFLAGS) -c $< -o $@
|
||||
@PROFILE_CMT@ @$(CC) $(ALL_CFLAGS) -g -pg -o profiled/$*.o -c $<
|
||||
@CHECKER_CMT@ @$(CC) $(ALL_CFLAGS) -checker -g -o checker/$*.o -c $<
|
||||
@ELF_CMT@ @$(CC) $(ALL_CFLAGS) -fPIC -o elfshared/$*.o -c $<
|
||||
@@ -65,8 +64,7 @@ e2p.pc: $(srcdir)/e2p.pc.in $(top_buildd
|
||||
@cd $(top_builddir); CONFIG_FILES=lib/e2p/e2p.pc ./config.status
|
||||
|
||||
tst_ostype: $(srcdir)/ostype.c
|
||||
- @echo " LD $@"
|
||||
- @$(CC) -DTEST_PROGRAM -I$(top_srcdir)/lib -o tst_ostype \
|
||||
+ $(CC) -DTEST_PROGRAM -I$(top_srcdir)/lib -o tst_ostype \
|
||||
$(srcdir)/ostype.c $(ALL_CFLAGS)
|
||||
|
||||
check:: tst_ostype
|
||||
Index: e2fsprogs-1.40.7/lib/ss/Makefile.in
|
||||
===================================================================
|
||||
--- e2fsprogs-1.40.7.orig/lib/ss/Makefile.in
|
||||
+++ e2fsprogs-1.40.7/lib/ss/Makefile.in
|
||||
@@ -37,12 +37,11 @@ MK_CMDS=_SS_DIR_OVERRIDE=. ./mk_cmds
|
||||
XTRA_CFLAGS= -I$(srcdir)/../et
|
||||
|
||||
.c.o:
|
||||
- @echo " CC $<"
|
||||
- @$(CC) $(ALL_CFLAGS) -c $<
|
||||
-@PROFILE_CMT@ @$(CC) $(ALL_CFLAGS) -g -pg -o profiled/$*.o -c $<
|
||||
-@CHECKER_CMT@ @$(CC) $(ALL_CFLAGS) -checker -g -o checker/$*.o -c $<
|
||||
-@ELF_CMT@ @$(CC) $(ALL_CFLAGS) -DSHARED_ELF_LIB -fPIC -o elfshared/$*.o -c $<
|
||||
-@BSDLIB_CMT@ @$(CC) $(ALL_CFLAGS) $(BSDLIB_PIC_FLAG) -o pic/$*.o -c $<
|
||||
+ $(CC) $(ALL_CFLAGS) -c $<
|
||||
+@PROFILE_CMT@ $(CC) $(ALL_CFLAGS) -g -pg -o profiled/$*.o -c $<
|
||||
+@CHECKER_CMT@ $(CC) $(ALL_CFLAGS) -checker -g -o checker/$*.o -c $<
|
||||
+@ELF_CMT@ $(CC) $(ALL_CFLAGS) -DSHARED_ELF_LIB -fPIC -o elfshared/$*.o -c $<
|
||||
+@BSDLIB_CMT@ $(CC) $(ALL_CFLAGS) $(BSDLIB_PIC_FLAG) -o pic/$*.o -c $<
|
||||
|
||||
# for the library
|
||||
|
||||
@@ -106,8 +105,7 @@ test_cmd.c: test_cmd.ct mk_cmds
|
||||
@DIR=$(srcdir) $(MK_CMDS) $(srcdir)/test_cmd.ct
|
||||
|
||||
ss_err.c ss_err.h: ss_err.et
|
||||
- @echo " COMPILE_ET ss_err.et"
|
||||
- @$(COMPILE_ET) $(srcdir)/ss_err.et
|
||||
+ $(COMPILE_ET) $(srcdir)/ss_err.et
|
||||
|
||||
ct.tab.c ct.tab.h: ct.y
|
||||
$(RM) -f ct.tab.* y.*
|
||||
@@ -120,9 +118,8 @@ ct.tab.c ct.tab.h: ct.y
|
||||
# $(CHMOD) -x $@
|
||||
|
||||
mk_cmds: $(DEP_SUBSTITUTE) $(srcdir)/mk_cmds.sh.in
|
||||
- @echo " SUBST $@"
|
||||
- @$(SUBSTITUTE) $(srcdir)/mk_cmds.sh.in mk_cmds
|
||||
- @$(CHMOD) +x mk_cmds
|
||||
+ $(SUBSTITUTE) $(srcdir)/mk_cmds.sh.in mk_cmds
|
||||
+ $(CHMOD) +x mk_cmds
|
||||
|
||||
ss.pc: $(srcdir)/ss.pc.in $(top_builddir)/config.status
|
||||
@echo " CONFIG.STATUS $@"
|
||||
@@ -164,8 +161,8 @@ uninstall::
|
||||
$(RM) -rf $(DESTDIR)$(includedir)/ss $(DESTDIR)$(datadir)/ss
|
||||
|
||||
test_ss: test_ss.o test_cmd.o $(LIBSS) $(LIBCOM_ERR)
|
||||
- @echo " LD $@"
|
||||
- @$(CC) -o $@ test_ss.o test_cmd.o $(ALL_CFLAGS) \
|
||||
+ echo " LD $@"
|
||||
+ $(CC) -o $@ test_ss.o test_cmd.o $(ALL_CFLAGS) \
|
||||
$(LIBSS) $(LIBCOM_ERR)
|
||||
|
||||
check:: all test_ss
|
||||
Index: e2fsprogs-1.40.7/lib/uuid/Makefile.in
|
||||
===================================================================
|
||||
--- e2fsprogs-1.40.7.orig/lib/uuid/Makefile.in
|
||||
+++ e2fsprogs-1.40.7/lib/uuid/Makefile.in
|
||||
@@ -60,12 +60,11 @@ BSDLIB_INSTALL_DIR = $(root_libdir)
|
||||
@MAKEFILE_CHECKER@
|
||||
|
||||
.c.o:
|
||||
- @echo " CC $<"
|
||||
- @$(CC) $(ALL_CFLAGS) -c $< -o $@
|
||||
-@PROFILE_CMT@ @$(CC) $(ALL_CFLAGS) -g -pg -o profiled/$*.o -c $<
|
||||
-@CHECKER_CMT@ @$(CC) $(ALL_CFLAGS) -checker -g -o checker/$*.o -c $<
|
||||
-@ELF_CMT@ @$(CC) $(ALL_CFLAGS) -fPIC -o elfshared/$*.o -c $<
|
||||
-@BSDLIB_CMT@ @$(CC) $(ALL_CFLAGS) $(BSDLIB_PIC_FLAG) -o pic/$*.o -c $<
|
||||
+ $(CC) $(ALL_CFLAGS) -c $< -o $@
|
||||
+@PROFILE_CMT@ $(CC) $(ALL_CFLAGS) -g -pg -o profiled/$*.o -c $<
|
||||
+@CHECKER_CMT@ $(CC) $(ALL_CFLAGS) -checker -g -o checker/$*.o -c $<
|
||||
+@ELF_CMT@ $(CC) $(ALL_CFLAGS) -fPIC -o elfshared/$*.o -c $<
|
||||
+@BSDLIB_CMT@ $(CC) $(ALL_CFLAGS) $(BSDLIB_PIC_FLAG) -o pic/$*.o -c $<
|
||||
|
||||
all:: tst_uuid uuid_time $(SMANPAGES) uuid.pc
|
||||
|
||||
@@ -73,53 +72,41 @@ $(top_builddir)/lib/uuid/uuid_types.h: $
|
||||
cd $(top_builddir); CONFIG_FILES=$(my_dir)/uuid_types.h ./config.status
|
||||
|
||||
tst_uuid.o: $(srcdir)/tst_uuid.c
|
||||
- @echo " CC $@"
|
||||
- @$(CC) $(ALL_CFLAGS) -c $(srcdir)/tst_uuid.c -o tst_uuid.o
|
||||
+ $(CC) $(ALL_CFLAGS) -c $(srcdir)/tst_uuid.c -o tst_uuid.o
|
||||
|
||||
tst_uuid: tst_uuid.o $(DEPSTATIC_LIBUUID)
|
||||
- @echo " LD $@"
|
||||
- @$(CC) $(ALL_LDFLAGS) -o tst_uuid tst_uuid.o $(STATIC_LIBUUID)
|
||||
+ $(CC) $(ALL_LDFLAGS) -o tst_uuid tst_uuid.o $(STATIC_LIBUUID)
|
||||
|
||||
uuid_time: $(srcdir)/uuid_time.c $(DEPLIBUUID)
|
||||
- @echo " LD $@"
|
||||
- @$(CC) $(ALL_CFLAGS) -DDEBUG -o uuid_time $(srcdir)/uuid_time.c \
|
||||
+ $(CC) $(ALL_CFLAGS) -DDEBUG -o uuid_time $(srcdir)/uuid_time.c \
|
||||
$(LIBUUID)
|
||||
|
||||
uuid.3: $(DEP_SUBSTITUTE) $(srcdir)/uuid.3.in
|
||||
- @echo " SUBST $@"
|
||||
- @$(SUBSTITUTE_UPTIME) $(srcdir)/uuid.3.in uuid.3
|
||||
+ $(SUBSTITUTE_UPTIME) $(srcdir)/uuid.3.in uuid.3
|
||||
|
||||
uuid_clear.3: $(DEP_SUBSTITUTE) $(srcdir)/uuid_clear.3.in
|
||||
- @echo " SUBST $@"
|
||||
- @$(SUBSTITUTE_UPTIME) $(srcdir)/uuid_clear.3.in uuid_clear.3
|
||||
+ $(SUBSTITUTE_UPTIME) $(srcdir)/uuid_clear.3.in uuid_clear.3
|
||||
|
||||
uuid_compare.3: $(DEP_SUBSTITUTE) $(srcdir)/uuid_compare.3.in
|
||||
- @echo " SUBST $@"
|
||||
- @$(SUBSTITUTE_UPTIME) $(srcdir)/uuid_compare.3.in uuid_compare.3
|
||||
+ $(SUBSTITUTE_UPTIME) $(srcdir)/uuid_compare.3.in uuid_compare.3
|
||||
|
||||
uuid_copy.3: $(DEP_SUBSTITUTE) $(srcdir)/uuid_copy.3.in
|
||||
- @echo " SUBST $@"
|
||||
- @$(SUBSTITUTE_UPTIME) $(srcdir)/uuid_copy.3.in uuid_copy.3
|
||||
+ $(SUBSTITUTE_UPTIME) $(srcdir)/uuid_copy.3.in uuid_copy.3
|
||||
|
||||
uuid_generate.3: $(DEP_SUBSTITUTE) $(srcdir)/uuid_generate.3.in
|
||||
- @echo " SUBST $@"
|
||||
- @$(SUBSTITUTE_UPTIME) $(srcdir)/uuid_generate.3.in uuid_generate.3
|
||||
+ $(SUBSTITUTE_UPTIME) $(srcdir)/uuid_generate.3.in uuid_generate.3
|
||||
|
||||
uuid_is_null.3: $(DEP_SUBSTITUTE) $(srcdir)/uuid_is_null.3.in
|
||||
- @echo " SUBST $@"
|
||||
- @$(SUBSTITUTE_UPTIME) $(srcdir)/uuid_is_null.3.in uuid_is_null.3
|
||||
+ $(SUBSTITUTE_UPTIME) $(srcdir)/uuid_is_null.3.in uuid_is_null.3
|
||||
|
||||
uuid_parse.3: $(DEP_SUBSTITUTE) $(srcdir)/uuid_parse.3.in
|
||||
- @echo " SUBST $@"
|
||||
- @$(SUBSTITUTE_UPTIME) $(srcdir)/uuid_parse.3.in uuid_parse.3
|
||||
+ $(SUBSTITUTE_UPTIME) $(srcdir)/uuid_parse.3.in uuid_parse.3
|
||||
|
||||
uuid_time.3: $(DEP_SUBSTITUTE) $(srcdir)/uuid_time.3.in
|
||||
- @echo " SUBST $@"
|
||||
- @$(SUBSTITUTE_UPTIME) $(srcdir)/uuid_time.3.in uuid_time.3
|
||||
+ $(SUBSTITUTE_UPTIME) $(srcdir)/uuid_time.3.in uuid_time.3
|
||||
|
||||
uuid_unparse.3: $(DEP_SUBSTITUTE) $(srcdir)/uuid_unparse.3.in
|
||||
- @echo " SUBST $@"
|
||||
- @$(SUBSTITUTE_UPTIME) $(srcdir)/uuid_unparse.3.in uuid_unparse.3
|
||||
+ $(SUBSTITUTE_UPTIME) $(srcdir)/uuid_unparse.3.in uuid_unparse.3
|
||||
|
||||
uuid.pc: $(srcdir)/uuid.pc.in $(top_builddir)/config.status
|
||||
@echo " CONFIG.STATUS $@"
|
||||
Index: e2fsprogs-1.40.7/e2fsck/Makefile.in
|
||||
===================================================================
|
||||
--- e2fsprogs-1.40.7.orig/e2fsck/Makefile.in
|
||||
+++ e2fsprogs-1.40.7/e2fsck/Makefile.in
|
||||
@@ -33,9 +33,8 @@ PROFILED_DEPLIBS= $(PROFILED_LIBEXT2FS)
|
||||
COMPILE_ET=$(top_builddir)/lib/et/compile_et --build-tree
|
||||
|
||||
.c.o:
|
||||
- @echo " CC $<"
|
||||
- @$(CC) -c $(ALL_CFLAGS) $< -o $@
|
||||
-@PROFILE_CMT@ @$(CC) $(ALL_CFLAGS) -g -pg -o profiled/$*.o -c $<
|
||||
+ $(CC) -c $(ALL_CFLAGS) $< -o $@
|
||||
+@PROFILE_CMT@ $(CC) $(ALL_CFLAGS) -g -pg -o profiled/$*.o -c $<
|
||||
|
||||
#
|
||||
# Flags for using Checker
|
||||
@@ -113,45 +112,36 @@ prof_err.c prof_err.h: prof_err.et
|
||||
@$(COMPILE_ET) $(srcdir)/prof_err.et
|
||||
|
||||
e2fsck: $(OBJS) $(DEPLIBS)
|
||||
- @echo " LD $@"
|
||||
- @$(LD) $(ALL_LDFLAGS) -o e2fsck $(OBJS) $(LIBS)
|
||||
+ $(LD) $(ALL_LDFLAGS) -o e2fsck $(OBJS) $(LIBS)
|
||||
|
||||
e2fsck.static: $(OBJS) $(STATIC_DEPLIBS)
|
||||
- @echo " LD $@"
|
||||
- @$(LD) $(ALL_LDFLAGS) $(LDFLAG_STATIC) -o e2fsck.static $(OBJS) \
|
||||
+ $(LD) $(ALL_LDFLAGS) $(LDFLAG_STATIC) -o e2fsck.static $(OBJS) \
|
||||
$(STATIC_LIBS)
|
||||
|
||||
e2fsck.profiled: $(PROFILED_OBJS) $(PROFILED_DEPLIBS)
|
||||
- @echo " LD $@"
|
||||
- @$(LD) $(ALL_LDFLAGS) -g -pg -o e2fsck.profiled $(PROFILED_OBJS) \
|
||||
+ $(LD) $(ALL_LDFLAGS) -g -pg -o e2fsck.profiled $(PROFILED_OBJS) \
|
||||
$(PROFILED_LIBS)
|
||||
|
||||
tst_refcount: ea_refcount.c
|
||||
- @echo " LD $@"
|
||||
- @$(CC) -o tst_refcount $(srcdir)/ea_refcount.c \
|
||||
+ $(CC) -o tst_refcount $(srcdir)/ea_refcount.c \
|
||||
$(ALL_CFLAGS) -DTEST_PROGRAM -lcom_err
|
||||
|
||||
tst_region: region.c
|
||||
- @echo " LD $@"
|
||||
- @$(CC) -o tst_region $(srcdir)/region.c \
|
||||
+ $(CC) -o tst_region $(srcdir)/region.c \
|
||||
$(ALL_CFLAGS) -DTEST_PROGRAM -lcom_err
|
||||
|
||||
extend: extend.o
|
||||
- @echo " LD $@"
|
||||
- @$(LD) $(ALL_LDFLAGS) -o extend extend.o $(CHECKLIB)
|
||||
+ $(LD) $(ALL_LDFLAGS) -o extend extend.o $(CHECKLIB)
|
||||
|
||||
flushb: flushb.o
|
||||
- @echo " LD $@"
|
||||
- @$(LD) $(ALL_LDFLAGS) -o flushb flushb.o $(CHECKLIB)
|
||||
+ $(LD) $(ALL_LDFLAGS) -o flushb flushb.o $(CHECKLIB)
|
||||
|
||||
iscan: iscan.o util.o ehandler.o $(DEPLIBS)
|
||||
- @echo " LD $@"
|
||||
- @$(LD) $(ALL_LDFLAGS) -o iscan iscan.o util.o ehandler.o $(LIBS)
|
||||
+ $(LD) $(ALL_LDFLAGS) -o iscan iscan.o util.o ehandler.o $(LIBS)
|
||||
|
||||
test_profile: $(srcdir)/profile.c profile_helpers.o argv_parse.o \
|
||||
prof_err.o profile.h $(STATIC_LIBCOM_ERR)
|
||||
- @echo " LD $@"
|
||||
- @$(CC) -o test_profile -DDEBUG_PROGRAM $(srcdir)/profile.c prof_err.o \
|
||||
+ $(CC) -o test_profile -DDEBUG_PROGRAM $(srcdir)/profile.c prof_err.o \
|
||||
profile_helpers.o argv_parse.o $(STATIC_LIBCOM_ERR) \
|
||||
$(ALL_CFLAGS)
|
||||
|
||||
@@ -160,16 +150,13 @@ profiled:
|
||||
@PROFILE_CMT@ @mkdir profiled
|
||||
|
||||
e2fsck.8: $(DEP_SUBSTITUTE) $(srcdir)/e2fsck.8.in
|
||||
- @echo " SUBST $@"
|
||||
- @$(SUBSTITUTE_UPTIME) $(srcdir)/e2fsck.8.in e2fsck.8
|
||||
+ $(SUBSTITUTE_UPTIME) $(srcdir)/e2fsck.8.in e2fsck.8
|
||||
|
||||
e2fsck.conf.5: $(DEP_SUBSTITUTE) $(srcdir)/e2fsck.conf.5.in
|
||||
- @echo " SUBST $@"
|
||||
- @$(SUBSTITUTE_UPTIME) $(srcdir)/e2fsck.conf.5.in e2fsck.conf.5
|
||||
+ $(SUBSTITUTE_UPTIME) $(srcdir)/e2fsck.conf.5.in e2fsck.conf.5
|
||||
|
||||
installdirs:
|
||||
- @echo " MKINSTALLDIRS $(root_sbindir) $(man8dir)"
|
||||
- @$(MKINSTALLDIRS) $(DESTDIR)$(root_sbindir) \
|
||||
+ $(MKINSTALLDIRS) $(DESTDIR)$(root_sbindir) \
|
||||
$(DESTDIR)$(man8dir) $(DESTDIR)$(man5dir)
|
||||
|
||||
install: $(PROGS) $(MANPAGES) $(FMANPAGES) installdirs
|
||||
@@ -177,11 +164,9 @@ install: $(PROGS) $(MANPAGES) $(FMANPAGE
|
||||
echo " INSTALL $(root_sbindir)/$$i"; \
|
||||
$(INSTALL_PROGRAM) $$i $(DESTDIR)$(root_sbindir)/$$i; \
|
||||
done
|
||||
- @echo " LINK $(root_sbindir)/fsck.ext2"
|
||||
- @$(LN) -f $(DESTDIR)$(root_sbindir)/e2fsck \
|
||||
+ $(LN) -f $(DESTDIR)$(root_sbindir)/e2fsck \
|
||||
$(DESTDIR)$(root_sbindir)/fsck.ext2
|
||||
- @echo " LINK $(root_sbindir)/fsck.ext3"
|
||||
- @$(LN) -f $(DESTDIR)$(root_sbindir)/e2fsck \
|
||||
+ $(LN) -f $(DESTDIR)$(root_sbindir)/e2fsck \
|
||||
$(DESTDIR)$(root_sbindir)/fsck.ext3
|
||||
@for i in $(MANPAGES); do \
|
||||
for j in $(COMPRESS_EXT); do \
|
||||
@@ -197,11 +182,9 @@ install: $(PROGS) $(MANPAGES) $(FMANPAGE
|
||||
echo " INSTALL_DATA $(man5dir)/$$i"; \
|
||||
$(INSTALL_DATA) $$i $(DESTDIR)$(man5dir)/$$i; \
|
||||
done
|
||||
- @echo " LINK $(man8dir)/fsck.ext2.8"
|
||||
- @$(LN) -f $(DESTDIR)$(man8dir)/e2fsck.8 \
|
||||
+ $(LN) -f $(DESTDIR)$(man8dir)/e2fsck.8 \
|
||||
$(DESTDIR)$(man8dir)/fsck.ext2.8
|
||||
- @echo " LINK $(man8dir)/fsck.ext3.8"
|
||||
- @$(LN) -f $(DESTDIR)$(man8dir)/e2fsck.8 \
|
||||
+ $(LN) -f $(DESTDIR)$(man8dir)/e2fsck.8 \
|
||||
$(DESTDIR)$(man8dir)/fsck.ext3.8
|
||||
|
||||
install-strip: install
|
||||
Index: e2fsprogs-1.40.7/debugfs/Makefile.in
|
||||
===================================================================
|
||||
--- e2fsprogs-1.40.7.orig/debugfs/Makefile.in
|
||||
+++ e2fsprogs-1.40.7/debugfs/Makefile.in
|
||||
@@ -30,26 +30,21 @@ LIBS= $(LIBEXT2FS) $(LIBE2P) $(LIBSS) $(
|
||||
DEPLIBS= $(LIBEXT2FS) $(LIBE2P) $(LIBSS) $(LIBCOM_ERR) $(DEPLIBBLKID) $(DEPLIBUUID)
|
||||
|
||||
.c.o:
|
||||
- @echo " CC $<"
|
||||
- @$(CC) -c $(ALL_CFLAGS) $< -o $@
|
||||
+ $(CC) -c $(ALL_CFLAGS) $< -o $@
|
||||
|
||||
all:: $(PROGS) $(MANPAGES)
|
||||
|
||||
debugfs: $(DEBUG_OBJS) $(DEPLIBS)
|
||||
- @echo " LD $@"
|
||||
- @$(CC) $(ALL_LDFLAGS) -o debugfs $(DEBUG_OBJS) $(LIBS)
|
||||
+ $(CC) $(ALL_LDFLAGS) -o debugfs $(DEBUG_OBJS) $(LIBS)
|
||||
|
||||
debug_cmds.c debug_cmds.h: debug_cmds.ct
|
||||
- @echo " MK_CMDS $@"
|
||||
- @$(MK_CMDS) $(srcdir)/debug_cmds.ct
|
||||
+ $(MK_CMDS) $(srcdir)/debug_cmds.ct
|
||||
|
||||
debugfs.8: $(DEP_SUBSTITUTE) $(srcdir)/debugfs.8.in
|
||||
- @echo " SUBST $@"
|
||||
- @$(SUBSTITUTE_UPTIME) $(srcdir)/debugfs.8.in debugfs.8
|
||||
+ $(SUBSTITUTE_UPTIME) $(srcdir)/debugfs.8.in debugfs.8
|
||||
|
||||
installdirs:
|
||||
- @echo " MKINSTALLDIRS $(root_sbindir) $(man8dir)"
|
||||
- @$(MKINSTALLDIRS) $(DESTDIR)$(root_sbindir) \
|
||||
+ $(MKINSTALLDIRS) $(DESTDIR)$(root_sbindir) \
|
||||
$(DESTDIR)$(man8dir)
|
||||
|
||||
install: $(PROGS) $(MANPAGES) installdirs
|
||||
Index: e2fsprogs-1.40.7/resize/Makefile.in
|
||||
===================================================================
|
||||
--- e2fsprogs-1.40.7.orig/resize/Makefile.in
|
||||
+++ e2fsprogs-1.40.7/resize/Makefile.in
|
||||
@@ -34,31 +34,25 @@ STATIC_LIBS= $(STATIC_LIBE2P) $(STATIC_L
|
||||
STATIC_DEPLIBS= $(STATIC_LIBE2P) $(STATIC_LIBEXT2FS) $(STATIC_LIBCOM_ERR)
|
||||
|
||||
.c.o:
|
||||
- @echo " CC $<"
|
||||
- @$(CC) -c $(ALL_CFLAGS) $< -o $@
|
||||
+ $(CC) -c $(ALL_CFLAGS) $< -o $@
|
||||
|
||||
all:: $(PROGS) $(TEST_PROGS) $(MANPAGES)
|
||||
|
||||
resize2fs: $(RESIZE_OBJS) $(DEPLIBS)
|
||||
- @echo " LD $@"
|
||||
- @$(CC) $(ALL_LDFLAGS) -o resize2fs $(RESIZE_OBJS) $(LIBS)
|
||||
+ $(CC) $(ALL_LDFLAGS) -o resize2fs $(RESIZE_OBJS) $(LIBS)
|
||||
|
||||
resize2fs.static: $(RESIZE_OBJS) $(STATIC_DEPLIBS)
|
||||
- @echo " LD $@"
|
||||
- @$(LD) $(ALL_LDFLAGS) $(LDFLAG_STATIC) -o resize2fs.static \
|
||||
+ $(LD) $(ALL_LDFLAGS) $(LDFLAG_STATIC) -o resize2fs.static \
|
||||
$(RESIZE_OBJS) $(STATIC_LIBS)
|
||||
|
||||
resize2fs.8: $(DEP_SUBSTITUTE) $(srcdir)/resize2fs.8.in
|
||||
- @echo " SUBST $@"
|
||||
- @$(SUBSTITUTE_UPTIME) $(srcdir)/resize2fs.8.in resize2fs.8
|
||||
+ $(SUBSTITUTE_UPTIME) $(srcdir)/resize2fs.8.in resize2fs.8
|
||||
|
||||
test_extent: $(TEST_EXTENT_OBJS)
|
||||
- @echo " LD $@"
|
||||
- @$(CC) $(ALL_LDFLAGS) -o test_extent $(TEST_EXTENT_OBJS) $(LIBS)
|
||||
+ $(CC) $(ALL_LDFLAGS) -o test_extent $(TEST_EXTENT_OBJS) $(LIBS)
|
||||
|
||||
installdirs:
|
||||
- @echo " MKINSTALLDIRS $(root_sbindir) $(man8dir)"
|
||||
- @$(MKINSTALLDIRS) $(DESTDIR)$(root_sbindir) \
|
||||
+ $(MKINSTALLDIRS) $(DESTDIR)$(root_sbindir) \
|
||||
$(DESTDIR)$(man8dir)
|
||||
|
||||
install: $(PROGS) $(MANPAGES) installdirs
|
||||
Index: e2fsprogs-1.40.7/util/Makefile.in
|
||||
===================================================================
|
||||
--- e2fsprogs-1.40.7.orig/util/Makefile.in
|
||||
+++ e2fsprogs-1.40.7/util/Makefile.in
|
||||
@@ -14,20 +14,17 @@ SRCS = $(srcdir)/subst.c
|
||||
@MCONFIG@
|
||||
|
||||
.c.o:
|
||||
- @echo " CC $<"
|
||||
- @$(BUILD_CC) -c $(BUILD_CFLAGS) $< -o $@
|
||||
+ $(BUILD_CC) -c $(BUILD_CFLAGS) $< -o $@
|
||||
|
||||
PROGS= subst
|
||||
|
||||
all:: $(PROGS) gen-tarball
|
||||
|
||||
subst: subst.o
|
||||
- @echo " LD $@"
|
||||
- @$(BUILD_CC) $(BUILD_LDFLAGS) -o subst subst.o
|
||||
+ $(BUILD_CC) $(BUILD_LDFLAGS) -o subst subst.o
|
||||
|
||||
copy_sparse: copy_sparse.o
|
||||
- @echo " LD $@"
|
||||
- @$(BUILD_CC) $(BUILD_LDFLAGS) -o copy_sparse copy_sparse.o
|
||||
+ $(BUILD_CC) $(BUILD_LDFLAGS) -o copy_sparse copy_sparse.o
|
||||
|
||||
gen-tarball: $(srcdir)/gen-tarball.in $(top_builddir)/config.status
|
||||
@echo " CONFIG.STATUS $@"
|
||||
Index: e2fsprogs-1.40.7/tests/progs/Makefile.in
|
||||
===================================================================
|
||||
--- e2fsprogs-1.40.7.orig/tests/progs/Makefile.in
|
||||
+++ e2fsprogs-1.40.7/tests/progs/Makefile.in
|
||||
@@ -25,26 +25,21 @@ LIBS= $(LIBEXT2FS) $(LIBSS) $(LIBCOM_ERR
|
||||
DEPLIBS= $(LIBEXT2FS) $(LIBSS) $(LIBCOM_ERR)
|
||||
|
||||
.c.o:
|
||||
- @echo " CC $<"
|
||||
- @$(CC) -c $(ALL_CFLAGS) $< -o $@
|
||||
+ $(CC) -c $(ALL_CFLAGS) $< -o $@
|
||||
|
||||
all:: $(PROGS)
|
||||
|
||||
test_rel: $(TEST_REL_OBJS) $(DEPLIBS)
|
||||
- @echo " LD $@"
|
||||
- @$(LD) $(ALL_LDFLAGS) -o test_rel $(TEST_REL_OBJS) $(LIBS)
|
||||
+ $(LD) $(ALL_LDFLAGS) -o test_rel $(TEST_REL_OBJS) $(LIBS)
|
||||
|
||||
test_rel_cmds.c: test_rel_cmds.ct
|
||||
- @echo " MK_CMDS $@"
|
||||
- @$(MK_CMDS) $(srcdir)/test_rel_cmds.ct
|
||||
+ $(MK_CMDS) $(srcdir)/test_rel_cmds.ct
|
||||
|
||||
test_icount: $(TEST_ICOUNT_OBJS) $(DEPLIBS)
|
||||
- @echo " LD $@"
|
||||
- @$(LD) $(ALL_LDFLAGS) -o test_icount $(TEST_ICOUNT_OBJS) $(LIBS)
|
||||
+ $(LD) $(ALL_LDFLAGS) -o test_icount $(TEST_ICOUNT_OBJS) $(LIBS)
|
||||
|
||||
test_icount_cmds.c: test_icount_cmds.ct
|
||||
- @echo " MK_CMDS $@"
|
||||
- @$(MK_CMDS) $(srcdir)/test_icount_cmds.ct
|
||||
+ $(MK_CMDS) $(srcdir)/test_icount_cmds.ct
|
||||
|
||||
clean:
|
||||
$(RM) -f $(PROGS) test_rel_cmds.c test_icount_cmds.c \
|
||||
Index: e2fsprogs-1.40.7/lib/et/Makefile.in
|
||||
===================================================================
|
||||
--- e2fsprogs-1.40.7.orig/lib/et/Makefile.in
|
||||
+++ e2fsprogs-1.40.7/lib/et/Makefile.in
|
||||
@@ -41,12 +41,11 @@ BSDLIB_INSTALL_DIR = $(root_libdir)
|
||||
# what to build...
|
||||
#
|
||||
.c.o:
|
||||
- @echo " CC $<"
|
||||
- @$(CC) $(ALL_CFLAGS) -c $< -o $@
|
||||
-@PROFILE_CMT@ @$(CC) $(ALL_CFLAGS) -g -pg -o profiled/$*.o -c $<
|
||||
-@CHECKER_CMT@ @$(CC) $(ALL_CFLAGS) -checker -g -o checker/$*.o -c $<
|
||||
-@ELF_CMT@ @$(CC) $(ALL_CFLAGS) -fPIC -o elfshared/$*.o -c $<
|
||||
-@BSDLIB_CMT@ @$(CC) $(ALL_CFLAGS) $(BSDLIB_PIC_FLAG) -o pic/$*.o -c $<
|
||||
+ $(CC) $(ALL_CFLAGS) -c $< -o $@
|
||||
+@PROFILE_CMT@ $(CC) $(ALL_CFLAGS) -g -pg -o profiled/$*.o -c $<
|
||||
+@CHECKER_CMT@ $(CC) $(ALL_CFLAGS) -checker -g -o checker/$*.o -c $<
|
||||
+@ELF_CMT@ $(CC) $(ALL_CFLAGS) -fPIC -o elfshared/$*.o -c $<
|
||||
+@BSDLIB_CMT@ $(CC) $(ALL_CFLAGS) $(BSDLIB_PIC_FLAG) -o pic/$*.o -c $<
|
||||
|
||||
@MAKEFILE_LIBRARY@
|
||||
@MAKEFILE_ELF@
|
||||
Index: e2fsprogs-1.40.7/misc/Makefile.in
|
||||
===================================================================
|
||||
--- e2fsprogs-1.40.7.orig/misc/Makefile.in
|
||||
+++ e2fsprogs-1.40.7/misc/Makefile.in
|
||||
@@ -71,8 +71,7 @@ DEPLIBS_E2P= $(LIBE2P) $(LIBCOM_ERR)
|
||||
COMPILE_ET=$(top_builddir)/lib/et/compile_et --build-tree
|
||||
|
||||
.c.o:
|
||||
- @echo " CC $<"
|
||||
- @$(CC) -c $(ALL_CFLAGS) $< -o $@
|
||||
+ $(CC) -c $(ALL_CFLAGS) $< -o $@
|
||||
|
||||
all:: $(SPROGS) $(UPROGS) $(USPROGS) $(SMANPAGES) $(UMANPAGES) \
|
||||
$(FMANPAGES) $(LPROGS)
|
||||
@@ -86,91 +85,71 @@ default_profile.c: $(srcdir)/mke2fs.conf
|
||||
$(AWK) -f $(srcdir)/profile-to-c.awk < $(srcdir)/mke2fs.conf \
|
||||
> default_profile.c
|
||||
profile.o:
|
||||
- @echo " CC $<"
|
||||
- @$(CC) -c $(ALL_CFLAGS) $(srcdir)/../e2fsck/profile.c -o $@
|
||||
+ $(CC) -c $(ALL_CFLAGS) $(srcdir)/../e2fsck/profile.c -o $@
|
||||
|
||||
findsuper: findsuper.o
|
||||
- @echo " LD $@"
|
||||
- @$(CC) $(ALL_LDFLAGS) -o findsuper findsuper.o
|
||||
+ $(CC) $(ALL_LDFLAGS) -o findsuper findsuper.o
|
||||
|
||||
partinfo: partinfo.o
|
||||
- @echo " LD $@"
|
||||
- @$(CC) $(ALL_LDFLAGS) -o partinfo partinfo.o
|
||||
+ $(CC) $(ALL_LDFLAGS) -o partinfo partinfo.o
|
||||
|
||||
e2initrd_helper: e2initrd_helper.o $(DEPLIBS) $(DEPLIBS_E2P) $(DEPLIBS_BLKID)
|
||||
- @echo " LD $@"
|
||||
- @$(CC) $(ALL_LDFLAGS) -o e2initrd_helper e2initrd_helper.o $(LIBS) \
|
||||
+ $(CC) $(ALL_LDFLAGS) -o e2initrd_helper e2initrd_helper.o $(LIBS) \
|
||||
$(LIBS_BLKID) $(LIBS_E2P) $(LIBINTL)
|
||||
|
||||
tune2fs: $(TUNE2FS_OBJS) $(DEPLIBS) $(DEPLIBS_E2P) $(DEPLIBS_BLKID)
|
||||
- @echo " LD $@"
|
||||
- @$(CC) $(ALL_LDFLAGS) -o tune2fs $(TUNE2FS_OBJS) $(LIBS) \
|
||||
+ $(CC) $(ALL_LDFLAGS) -o tune2fs $(TUNE2FS_OBJS) $(LIBS) \
|
||||
$(LIBS_BLKID) $(LIBS_E2P) $(LIBINTL)
|
||||
|
||||
blkid: $(BLKID_OBJS) $(DEPLIBS_BLKID)
|
||||
- @echo " LD $@"
|
||||
- @$(CC) $(ALL_LDFLAGS) -o blkid $(BLKID_OBJS) $(LIBS_BLKID) $(LIBINTL)
|
||||
+ $(CC) $(ALL_LDFLAGS) -o blkid $(BLKID_OBJS) $(LIBS_BLKID) $(LIBINTL)
|
||||
|
||||
e2image: $(E2IMAGE_OBJS) $(DEPLIBS)
|
||||
- @echo " LD $@"
|
||||
- @$(CC) $(ALL_LDFLAGS) -o e2image $(E2IMAGE_OBJS) $(LIBS) $(LIBINTL)
|
||||
+ $(CC) $(ALL_LDFLAGS) -o e2image $(E2IMAGE_OBJS) $(LIBS) $(LIBINTL)
|
||||
|
||||
base_device: base_device.c
|
||||
- @echo " LD $@"
|
||||
- @$(CC) $(ALL_CFLAGS) $(ALL_LDFLAGS) $(srcdir)/base_device.c \
|
||||
+ $(CC) $(ALL_CFLAGS) $(ALL_LDFLAGS) $(srcdir)/base_device.c \
|
||||
-DDEBUG -o base_device
|
||||
|
||||
mklost+found: $(MKLPF_OBJS)
|
||||
- @echo " LD $@"
|
||||
- @$(CC) $(ALL_LDFLAGS) -o mklost+found $(MKLPF_OBJS) $(LIBINTL)
|
||||
+ $(CC) $(ALL_LDFLAGS) -o mklost+found $(MKLPF_OBJS) $(LIBINTL)
|
||||
|
||||
mke2fs: $(MKE2FS_OBJS) $(DEPLIBS) $(LIBE2P) $(DEPLIBUUID) $(DEPLIBS_BLKID)
|
||||
- @echo " LD $@"
|
||||
- @$(CC) $(ALL_LDFLAGS) -o mke2fs $(MKE2FS_OBJS) $(LIBS) $(LIBS_BLKID) \
|
||||
+ $(CC) $(ALL_LDFLAGS) -o mke2fs $(MKE2FS_OBJS) $(LIBS) $(LIBS_BLKID) \
|
||||
$(LIBE2P) $(LIBUUID) $(LIBINTL)
|
||||
|
||||
mke2fs.static: $(MKE2FS_OBJS) $(STATIC_DEPLIBS) $(STATIC_LIBE2P) $(DEPSTATIC_LIBUUID) $(DEPSTATIC_LIBBLKID)
|
||||
- @echo " LD $@"
|
||||
- @$(CC) $(ALL_LDFLAGS) -static -o mke2fs.static $(MKE2FS_OBJS) \
|
||||
+ $(CC) $(ALL_LDFLAGS) -static -o mke2fs.static $(MKE2FS_OBJS) \
|
||||
$(STATIC_LIBS) $(STATIC_LIBE2P) $(STATIC_LIBBLKID) \
|
||||
$(STATIC_LIBUUID) $(LIBINTL)
|
||||
|
||||
chattr: $(CHATTR_OBJS) $(DEPLIBS_E2P)
|
||||
- @echo " LD $@"
|
||||
- @$(CC) $(ALL_LDFLAGS) -o chattr $(CHATTR_OBJS) $(LIBS_E2P) $(LIBINTL)
|
||||
+ $(CC) $(ALL_LDFLAGS) -o chattr $(CHATTR_OBJS) $(LIBS_E2P) $(LIBINTL)
|
||||
|
||||
lsattr: $(LSATTR_OBJS) $(DEPLIBS_E2P)
|
||||
- @echo " LD $@"
|
||||
- @$(CC) $(ALL_LDFLAGS) -o lsattr $(LSATTR_OBJS) $(LIBS_E2P) $(LIBINTL)
|
||||
+ $(CC) $(ALL_LDFLAGS) -o lsattr $(LSATTR_OBJS) $(LIBS_E2P) $(LIBINTL)
|
||||
|
||||
uuidgen: $(UUIDGEN_OBJS) $(DEPLIBUUID)
|
||||
- @echo " LD $@"
|
||||
- @$(CC) $(ALL_LDFLAGS) -o uuidgen $(UUIDGEN_OBJS) $(LIBUUID) $(LIBINTL)
|
||||
+ $(CC) $(ALL_LDFLAGS) -o uuidgen $(UUIDGEN_OBJS) $(LIBUUID) $(LIBINTL)
|
||||
|
||||
uuidd: $(UUIDD_OBJS) $(DEPLIBUUID)
|
||||
- @echo " LD $@"
|
||||
- @$(CC) $(ALL_LDFLAGS) -o uuidd $(UUIDD_OBJS) $(LIBUUID) $(LIBINTL)
|
||||
+ $(CC) $(ALL_LDFLAGS) -o uuidd $(UUIDD_OBJS) $(LIBUUID) $(LIBINTL)
|
||||
|
||||
dumpe2fs: $(DUMPE2FS_OBJS) $(DEPLIBS) $(DEPLIBS_E2P) $(DEPLIBUUID)
|
||||
- @echo " LD $@"
|
||||
- @$(CC) $(ALL_LDFLAGS) -o dumpe2fs $(DUMPE2FS_OBJS) $(LIBS) \
|
||||
+ $(CC) $(ALL_LDFLAGS) -o dumpe2fs $(DUMPE2FS_OBJS) $(LIBS) \
|
||||
$(LIBS_E2P) $(LIBUUID) $(LIBINTL)
|
||||
|
||||
fsck: $(FSCK_OBJS) $(DEBLIBS_VOLID)
|
||||
- @echo " LD $@"
|
||||
- @$(CC) $(ALL_LDFLAGS) -o fsck $(FSCK_OBJS) $(LIBS_VOLID) $(LIBINTL)
|
||||
+ $(CC) $(ALL_LDFLAGS) -o fsck $(FSCK_OBJS) $(LIBS_VOLID) $(LIBINTL)
|
||||
|
||||
badblocks: $(BADBLOCKS_OBJS) $(DEPLIBS)
|
||||
- @echo " LD $@"
|
||||
- @$(CC) $(ALL_LDFLAGS) -o badblocks $(BADBLOCKS_OBJS) $(LIBS) $(LIBINTL)
|
||||
+ $(CC) $(ALL_LDFLAGS) -o badblocks $(BADBLOCKS_OBJS) $(LIBS) $(LIBINTL)
|
||||
|
||||
logsave: logsave.o
|
||||
- @echo " LD $@"
|
||||
- @$(CC) $(ALL_LDFLAGS) -o logsave logsave.o
|
||||
+ $(CC) $(ALL_LDFLAGS) -o logsave logsave.o
|
||||
|
||||
filefrag: $(FILEFRAG_OBJS)
|
||||
- @echo " LD $@"
|
||||
- @$(CC) $(ALL_LDFLAGS) -o filefrag $(FILEFRAG_OBJS)
|
||||
+ $(CC) $(ALL_LDFLAGS) -o filefrag $(FILEFRAG_OBJS)
|
||||
|
||||
tst_ismounted: $(srcdir)/ismounted.c $(STATIC_LIBEXT2FS)
|
||||
@echo " LD $@"
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:6dbff724c2afced09668ec35566ed1d5a259314fe5095a3cf3a94e8fa9e5dfe2
|
||||
size 42292
|
||||
|
@ -1,3 +1,16 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed Jul 16 14:41:45 CEST 2008 - mkoenig@suse.de
|
||||
|
||||
- update to version 1.41.0
|
||||
* add support for ext4 filesystem features:
|
||||
extents, uninit_bg, flex_bg, huge_file, dir_nlink
|
||||
* support for checking journal checksums
|
||||
* tune2fs supports migrating fs from 128 byte inode to 256 byte
|
||||
* add support for "undo"
|
||||
* e2fsck now performs more extensive and careful checks of extended
|
||||
attributes stored in the inod
|
||||
- fix e2fsck make check
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Jul 2 20:21:49 CEST 2008 - schwab@suse.de
|
||||
|
||||
|
@ -1,5 +1,5 @@
|
||||
#
|
||||
# spec file for package e2fsprogs (Version 1.40.11)
|
||||
# spec file for package e2fsprogs (Version 1.41.0)
|
||||
#
|
||||
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
# This file and all modifications and additions to the pristine
|
||||
@ -19,8 +19,8 @@ Group: System/Filesystems
|
||||
Supplements: filesystem(ext2) filesystem(ext3)
|
||||
PreReq: %install_info_prereq
|
||||
AutoReqProv: on
|
||||
Version: 1.40.11
|
||||
Release: 4
|
||||
Version: 1.41.0
|
||||
Release: 1
|
||||
Summary: Utilities for the Second Extended File System
|
||||
Url: http://e2fsprogs.sourceforge.net
|
||||
Source: %{name}-%{version}.tar.bz2
|
||||
@ -34,6 +34,7 @@ Patch1: e2fsprogs-mdraid.patch
|
||||
Patch2: e2fsprogs-base_devt.patch
|
||||
Patch3: e2fsprogs-libvolume_id-support.patch
|
||||
Patch5: e2fsprogs-1.40.4-uuidd_pid_path.patch
|
||||
Patch6: e2fsprogs-1.41.0-tst_link_fix.patch
|
||||
# libcom_err patches
|
||||
# 66534 - [SL 10.0] et_list handling of krb5 and libcom_err.so.2 conflict
|
||||
Patch31: libcom_err-no-init_error_table.patch
|
||||
@ -236,6 +237,7 @@ Authors:
|
||||
%patch2 -p1
|
||||
%patch3 -p0
|
||||
%patch5 -p1
|
||||
%patch6 -p1
|
||||
# libcom_err patches
|
||||
%patch31 -p1
|
||||
%patch32 -p1
|
||||
@ -256,7 +258,7 @@ cp %{SOURCE2} .
|
||||
--libdir=%{_libdir} \
|
||||
--enable-elf-shlibs \
|
||||
--disable-evms \
|
||||
CFLAGS="$RPM_OPT_FLAGS"
|
||||
CFLAGS="$RPM_OPT_FLAGS"
|
||||
make
|
||||
|
||||
%install
|
||||
@ -337,14 +339,19 @@ rm -rf $RPM_BUILD_ROOT
|
||||
/sbin/badblocks
|
||||
/sbin/debugfs
|
||||
/sbin/dumpe2fs
|
||||
/sbin/e2undo
|
||||
/sbin/e2fsck
|
||||
/sbin/e2label
|
||||
/sbin/fsck
|
||||
/sbin/fsck.ext2
|
||||
/sbin/fsck.ext3
|
||||
/sbin/fsck.ext4
|
||||
/sbin/fsck.ext4dev
|
||||
/sbin/mke2fs
|
||||
/sbin/mkfs.ext2
|
||||
/sbin/mkfs.ext3
|
||||
/sbin/mkfs.ext4
|
||||
/sbin/mkfs.ext4dev
|
||||
/sbin/resize2fs
|
||||
/sbin/tune2fs
|
||||
/sbin/e2image
|
||||
@ -441,6 +448,16 @@ rm -rf $RPM_BUILD_ROOT
|
||||
%{_mandir}/man3/com_err.3.gz
|
||||
|
||||
%changelog
|
||||
* Wed Jul 16 2008 mkoenig@suse.de
|
||||
- update to version 1.41.0
|
||||
* add support for ext4 filesystem features:
|
||||
extents, uninit_bg, flex_bg, huge_file, dir_nlink
|
||||
* support for checking journal checksums
|
||||
* tune2fs supports migrating fs from 128 byte inode to 256 byte
|
||||
* add support for "undo"
|
||||
* e2fsck now performs more extensive and careful checks of extended
|
||||
attributes stored in the inod
|
||||
- fix e2fsck make check
|
||||
* Wed Jul 02 2008 schwab@suse.de
|
||||
- Remove doubleplusungood -fsigned-char.
|
||||
* Tue Jun 24 2008 mkoenig@suse.de
|
||||
|
Loading…
Reference in New Issue
Block a user