vitalif
/
e2fsprogs
mirror of https://github.com/vitalif/e2fsprogs
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'maint' into next

pu
Theodore Ts'o 2012-08-06 21:09:49 -04:00
parent 9f0dbd24f8 d45b67c5f2
commit 2d913dbcdf
7 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
e2fsck/ehandler.c
View File

@ -60,7 +60,7 @@ static errcode_t e2fsck_handle_read_error(io_channel channel,
preenhalt(ctx); preenhalt(ctx);
if (ask(ctx, _("Ignore error"), 1)) { if (ask(ctx, _("Ignore error"), 1)) {
if (ask(ctx, _("Force rewrite"), 1)) if (ask(ctx, _("Force rewrite"), 1))
io_channel_write_blk64(channel, block, 1, data); io_channel_write_blk64(channel, block, count, data);
return 0; return 0;
} }

5
lib/Makefile.elf-lib
View File

@ -24,8 +24,9 @@ image: $(ELF_LIB)
$(ELF_LIB): $(OBJS) $(ELF_LIB): $(OBJS)
$(E) " GEN_ELF_SOLIB $(ELF_LIB)" $(E) " GEN_ELF_SOLIB $(ELF_LIB)"
$(Q) (cd elfshared; $(CC) --shared -o $(ELF_LIB) $(ELF_OTHER_LIBS) \ $(Q) (cd elfshared; $(CC) --shared -o $(ELF_LIB) \
$(LDFLAGS) -Wl,-soname,$(ELF_SONAME) $(OBJS)) -L$(top_builddir)/../lib $(LDFLAGS) \
-Wl,-soname,$(ELF_SONAME) $(OBJS) $(ELF_OTHER_LIBS))
$(Q) $(MV) elfshared/$(ELF_LIB) . $(Q) $(MV) elfshared/$(ELF_LIB) .
$(Q) $(RM) -f ../$(ELF_LIB) ../$(ELF_IMAGE).so ../$(ELF_SONAME) $(Q) $(RM) -f ../$(ELF_LIB) ../$(ELF_IMAGE).so ../$(ELF_SONAME)
$(Q) (cd ..; $(LN) $(LINK_BUILD_FLAGS) \ $(Q) (cd ..; $(LN) $(LINK_BUILD_FLAGS) \

5
lib/Makefile.solaris-lib
View File

@ -24,8 +24,9 @@ image: $(ELF_LIB)
$(ELF_LIB): $(OBJS) $(ELF_LIB): $(OBJS)
$(E) " GEN_ELF_SOLIB $(ELF_LIB)" $(E) " GEN_ELF_SOLIB $(ELF_LIB)"
$(Q) (cd elfshared; $(CC) --shared -o $(ELF_LIB) $(ELF_OTHER_LIBS) \ $(Q) (cd elfshared; $(CC) --shared -o $(ELF_LIB) \
$(LDFLAGS) -Wl,-h,$(ELF_SONAME) $(OBJS)) -L$(top_builddir)/../lib $(LDFLAGS) \
-Wl,-h,$(ELF_SONAME) $(OBJS) $(ELF_OTHER_LIBS))
$(Q) $(MV) elfshared/$(ELF_LIB) . $(Q) $(MV) elfshared/$(ELF_LIB) .
$(Q) $(RM) -f ../$(ELF_LIB) ../$(ELF_IMAGE).so ../$(ELF_SONAME) $(Q) $(RM) -f ../$(ELF_LIB) ../$(ELF_IMAGE).so ../$(ELF_SONAME)
$(Q) (cd ..; $(LN) $(LINK_BUILD_FLAGS) \ $(Q) (cd ..; $(LN) $(LINK_BUILD_FLAGS) \

2
lib/blkid/Makefile.in
View File

@ -36,7 +36,7 @@ ELF_SO_VERSION = 1
ELF_IMAGE = libblkid ELF_IMAGE = libblkid
ELF_MYDIR = blkid ELF_MYDIR = blkid
ELF_INSTALL_DIR = $(root_libdir) ELF_INSTALL_DIR = $(root_libdir)
ELF_OTHER_LIBS = -L../.. -luuid ELF_OTHER_LIBS = -luuid
BSDLIB_VERSION = 2.0 BSDLIB_VERSION = 2.0
BSDLIB_IMAGE = libblkid BSDLIB_IMAGE = libblkid

2
lib/ext2fs/Makefile.in
View File

@ -182,7 +182,7 @@ ELF_SO_VERSION = 2
ELF_IMAGE = libext2fs ELF_IMAGE = libext2fs
ELF_MYDIR = ext2fs ELF_MYDIR = ext2fs
ELF_INSTALL_DIR = $(root_libdir) ELF_INSTALL_DIR = $(root_libdir)
ELF_OTHER_LIBS = -L../.. -lcom_err ELF_OTHER_LIBS = -lcom_err
BSDLIB_VERSION = 2.1 BSDLIB_VERSION = 2.1
BSDLIB_IMAGE = libext2fs BSDLIB_IMAGE = libext2fs

2
lib/quota/Makefile.in
View File

@ -31,7 +31,7 @@ LIBDIR= quota
#ELF_IMAGE = libquota #ELF_IMAGE = libquota
#ELF_MYDIR = quota #ELF_MYDIR = quota
#ELF_INSTALL_DIR = $(root_libdir) #ELF_INSTALL_DIR = $(root_libdir)
#ELF_OTHER_LIBS = -L../.. -lext2fs #ELF_OTHER_LIBS = -lext2fs
#BSDLIB_VERSION = 1.0 #BSDLIB_VERSION = 1.0
#BSDLIB_IMAGE = libquota #BSDLIB_IMAGE = libquota

2
lib/ss/Makefile.in
View File

@ -20,7 +20,7 @@ ELF_SO_VERSION = 2
ELF_IMAGE = libss ELF_IMAGE = libss
ELF_MYDIR = ss ELF_MYDIR = ss
ELF_INSTALL_DIR = $(root_libdir) ELF_INSTALL_DIR = $(root_libdir)
ELF_OTHER_LIBS = -L../.. -lcom_err $(DLOPEN_LIB) ELF_OTHER_LIBS = -lcom_err $(DLOPEN_LIB)
BSDLIB_VERSION = 1.0 BSDLIB_VERSION = 1.0
BSDLIB_IMAGE = libss BSDLIB_IMAGE = libss