mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-04-23 09:32:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

e2fsprogs: Drop stale unused patches, clean out unneeded metadata

Browse Source
This commit is contained in:
Richard Purdie
2009-01-03 18:10:30 +00:00
parent 1dc1601f65
commit a4ef0bb46a
7 changed files with 0 additions and 2383 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
meta/packages/e2fsprogs/e2fsprogs-native_1.41.2.bb
View File

@@ -1,10 +1,7 @@
SECTION = "base"
require e2fsprogs_${PV}.bb
inherit native
DEPENDS = "gettext-native"
FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/e2fsprogs-${PV}', '${FILE_DIRNAME}/e2fsprogs', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
PACKAGES = ""
do_stage () {
oe_runmake install

16
meta/packages/e2fsprogs/e2fsprogs/compile-subst.patch
View File

@@ -1,16 +0,0 @@
#
# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
#
--- e2fsprogs-1.33/util/subst.c~compile-subst
+++ e2fsprogs-1.33/util/subst.c
@@ -10,7 +10,7 @@
#include <stdlib.h>
#include <unistd.h>
#include <string.h>
-#include <ctype.h>
+//#include <ctype.h>
#ifdef HAVE_GETOPT_H
#include <getopt.h>

122
meta/packages/e2fsprogs/e2fsprogs/configure.patch
View File

@@ -1,122 +0,0 @@
#
# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
#
--- e2fsprogs-1.33/./lib/uuid/configure.in~configure
+++ e2fsprogs-1.33/./lib/uuid/configure.in
@@ -2,9 +2,11 @@
dnl Not used now, for the future when uuid is separated out into its
dnl own package.
dnl
-AC_INIT(gen_uuid.c)
-AC_PREREQ(2.12)
+AC_INIT
+AC_CONFIG_SRCDIR([gen_uuid.c])
+AC_PREREQ(2.57)
AC_CHECK_HEADERS(stdlib.h unistd.h sys/sockio.h net/if.h netinet/in.h)
AC_CHECK_FUNCS(srandom)
-AC_OUTPUT(Makefile)
+AC_CONFIG_FILES([Makefile])
+AC_OUTPUT
--- e2fsprogs-1.33/./configure.in~configure
+++ e2fsprogs-1.33/./configure.in
@@ -1,5 +1,6 @@
-AC_INIT(version.h)
-AC_PREREQ(2.12)
+AC_INIT
+AC_CONFIG_SRCDIR([version.h])
+AC_PREREQ(2.57)
MCONFIG=./MCONFIG
AC_SUBST_FILE(MCONFIG)
BINARY_TYPE=bin
@@ -537,10 +538,7 @@
dnl is not decleared.
AC_MSG_CHECKING(whether d_reclen declared in dirent)
AC_CACHE_VAL(e2fsprogs_cv_have_d_reclen_dirent,
- AC_TRY_COMPILE(
-[#include <dirent.h>], [struct dirent de; de.d_reclen = 0; ],
- [e2fsprogs_cv_have_d_reclen_dirent=yes],
- [e2fsprogs_cv_have_d_reclen_dirent=no]))
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <dirent.h>]], [[struct dirent de; de.d_reclen = 0; ]])],[e2fsprogs_cv_have_d_reclen_dirent=yes],[e2fsprogs_cv_have_d_reclen_dirent=no]))
AC_MSG_RESULT($e2fsprogs_cv_have_d_reclen_dirent)
if test "$e2fsprogs_cv_have_d_reclen_dirent" = yes; then
AC_DEFINE(HAVE_RECLEN_DIRENT)
@@ -548,10 +546,7 @@
dnl Check to see if ssize_t was decleared
AC_MSG_CHECKING(whether ssize_t declared)
AC_CACHE_VAL(e2fsprogs_cv_have_ssize_t,
- AC_TRY_COMPILE(
-[#include <sys/types.h>], [ssize_t a = 0; ],
- [e2fsprogs_cv_have_ssize_t=yes],
- [e2fsprogs_cv_have_ssize_t=no]))
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/types.h>]], [[ssize_t a = 0; ]])],[e2fsprogs_cv_have_ssize_t=yes],[e2fsprogs_cv_have_ssize_t=no]))
AC_MSG_RESULT($e2fsprogs_cv_have_ssize_t)
if test "$e2fsprogs_cv_have_ssize_t" = yes; then
AC_DEFINE(HAVE_TYPE_SSIZE_T)
@@ -565,10 +560,7 @@
dnl
AC_MSG_CHECKING(whether llseek declared in unistd.h)
AC_CACHE_VAL(e2fsprogs_cv_have_llseek_prototype,
- AC_TRY_COMPILE(
-[#include <unistd.h>], [extern int llseek(int);],
- [e2fsprogs_cv_have_llseek_prototype=no],
- [e2fsprogs_cv_have_llseek_prototype=yes]))
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <unistd.h>]], [[extern int llseek(int);]])],[e2fsprogs_cv_have_llseek_prototype=no],[e2fsprogs_cv_have_llseek_prototype=yes]))
AC_MSG_RESULT($e2fsprogs_cv_have_llseek_prototype)
if test "$e2fsprogs_cv_have_llseek_prototype" = yes; then
AC_DEFINE(HAVE_LLSEEK_PROTOTYPE)
@@ -584,12 +576,9 @@
dnl
AC_MSG_CHECKING(whether lseek64 declared in unistd.h)
AC_CACHE_VAL(e2fsprogs_cv_have_lseek64_prototype,
- AC_TRY_COMPILE(
-[#define _LARGEFILE_SOURCE
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#define _LARGEFILE_SOURCE
#define _LARGEFILE64_SOURCE
-#include <unistd.h>], [extern int lseek64(int);],
- [e2fsprogs_cv_have_lseek64_prototype=no],
- [e2fsprogs_cv_have_lseek64_prototype=yes]))
+#include <unistd.h>]], [[extern int lseek64(int);]])],[e2fsprogs_cv_have_lseek64_prototype=no],[e2fsprogs_cv_have_lseek64_prototype=yes]))
AC_MSG_RESULT($e2fsprogs_cv_have_lseek64_prototype)
if test "$e2fsprogs_cv_have_lseek64_prototype" = yes; then
AC_DEFINE(HAVE_LSEEK64_PROTOTYPE)
@@ -624,18 +613,12 @@
dnl
AC_MSG_CHECKING(whether struct stat has a st_flags field)
AC_CACHE_VAL(e2fsprogs_cv_struct_st_flags,
- AC_TRY_COMPILE([#include <sys/stat.h>],
- [struct stat stat; stat.st_flags = 0;],
- [e2fsprogs_cv_struct_st_flags=yes],
- [e2fsprogs_cv_struct_st_flags=no]))
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/stat.h>]], [[struct stat stat; stat.st_flags = 0;]])],[e2fsprogs_cv_struct_st_flags=yes],[e2fsprogs_cv_struct_st_flags=no]))
AC_MSG_RESULT($e2fsprogs_cv_struct_st_flags)
if test "$e2fsprogs_cv_struct_st_flags" = yes; then
AC_MSG_CHECKING(whether st_flags field is useful)
AC_CACHE_VAL(e2fsprogs_cv_struct_st_flags_immut,
- AC_TRY_COMPILE([#include <sys/stat.h>],
- [struct stat stat; stat.st_flags |= UF_IMMUTABLE;],
- [e2fsprogs_cv_struct_st_flags_immut=yes],
- [e2fsprogs_cv_struct_st_flags_immut=no]))
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/stat.h>]], [[struct stat stat; stat.st_flags |= UF_IMMUTABLE;]])],[e2fsprogs_cv_struct_st_flags_immut=yes],[e2fsprogs_cv_struct_st_flags_immut=no]))
AC_MSG_RESULT($e2fsprogs_cv_struct_st_flags_immut)
if test "$e2fsprogs_cv_struct_st_flags_immut" = yes; then
AC_DEFINE(HAVE_STAT_FLAGS)
@@ -747,8 +730,7 @@
AC_MSG_CHECKING([whether linker accepts -static])
AC_CACHE_VAL(ac_cv_e2fsprogs_use_static,
[SAVE_LDFLAGS=$LDFLAGS; LDFLAGS="$LDFLAGS -static"
-AC_TRY_LINK([#include <stdio.h>],[fflush(stdout);],
- ac_cv_e2fsprogs_use_static=yes, ac_cv_e2fsprogs_use_static=no)
+AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <stdio.h>]], [[fflush(stdout);]])],[ac_cv_e2fsprogs_use_static=yes],[ac_cv_e2fsprogs_use_static=no])
LDFLAGS=$SAVE_LDFLAGS])
dnl
dnl Regardless of how the test turns out, Solaris doesn't handle -static
@@ -804,4 +786,5 @@
outlist="$outlist $i"
fi
done
-AC_OUTPUT($outlist)
+AC_CONFIG_FILES([$outlist])
+AC_OUTPUT

27
meta/packages/e2fsprogs/e2fsprogs/ldflags.patch
View File

@@ -1,27 +0,0 @@
#
# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
#
--- e2fsprogs-1.34/lib/uuid/Makefile.in~ldflags
+++ e2fsprogs-1.34/lib/uuid/Makefile.in
@@ -94,7 +94,7 @@
$(CC) $(ALL_LDFLAGS) -o tst_uuid tst_uuid.o $(STATIC_LIBUUID)
uuid_time: $(srcdir)/uuid_time.c $(DEPLIBUUID)
- $(CC) $(ALL_CFLAGS) -DDEBUG -o uuid_time $(srcdir)/uuid_time.c \
+ $(CC) $(ALL_CFLAGS) -DDEBUG $(ALL_LDFLAGS) -o uuid_time $(srcdir)/uuid_time.c \
$(LIBUUID)
libuuid.3: $(DEP_SUBSTITUTE) $(srcdir)/libuuid.3.in
--- e2fsprogs-1.34/lib/evms/Makefile.in~ldflags
+++ e2fsprogs-1.34/lib/evms/Makefile.in
@@ -36,7 +36,7 @@
$(ELF_LIB): $(OBJS)
$(CC) --shared -o $(ELF_LIB) -Wl,-soname,$(ELF_SONAME) \
- $(OBJS) $(ELF_OTHER_LIBS)
+ $(OBJS) $(ELF_OTHER_LIBS) $(ALL_LDFLAGS)
installdirs::
$(top_srcdir)/mkinstalldirs $(DESTDIR)$(ELF_INSTALL_DIR)

58
meta/packages/e2fsprogs/e2fsprogs/ln.patch
View File

@@ -1,58 +0,0 @@
diff -urNd e2fsprogs-1.32/e2fsck/Makefile.in e2fsprogs-1.32-new/e2fsck/Makefile.in
--- e2fsprogs-1.32/e2fsck/Makefile.in 2002-10-31 02:49:21.000000000 -0600
+++ e2fsprogs-1.32-new/e2fsck/Makefile.in 2002-11-29 11:06:39.000000000 -0600
@@ -145,9 +145,9 @@
$(INSTALL_PROGRAM) $$i $(DESTDIR)$(root_sbindir)/$$i; \
$(STRIP) $(DESTDIR)$(root_sbindir)/$$i; \
done
- $(LN) -f $(DESTDIR)$(root_sbindir)/e2fsck \
+ $(LN_S) -f ./e2fsck \
$(DESTDIR)$(root_sbindir)/fsck.ext2
- $(LN) -f $(DESTDIR)$(root_sbindir)/e2fsck \
+ $(LN_S) -f ./e2fsck \
$(DESTDIR)$(root_sbindir)/fsck.ext3
for i in $(MANPAGES); do \
for j in $(COMPRESS_EXT); do \
@@ -155,8 +155,8 @@
done; \
$(INSTALL_DATA) $$i $(DESTDIR)$(man8dir)/$$i; \
done
- $(LN) -f $(DESTDIR)$(man8dir)/e2fsck.8 $(DESTDIR)$(man8dir)/fsck.ext2.8
- $(LN) -f $(DESTDIR)$(man8dir)/e2fsck.8 $(DESTDIR)$(man8dir)/fsck.ext3.8
+ $(LN_S) -f ./e2fsck.8 $(DESTDIR)$(man8dir)/fsck.ext2.8
+ $(LN_S) -f ./e2fsck.8 $(DESTDIR)$(man8dir)/fsck.ext3.8
uninstall:
for i in $(PROGS); do \
diff -urNd e2fsprogs-1.32/misc/Makefile.in e2fsprogs-1.32-new/misc/Makefile.in
--- e2fsprogs-1.32/misc/Makefile.in 2002-10-31 02:49:21.000000000 -0600
+++ e2fsprogs-1.32-new/misc/Makefile.in 2002-11-29 11:05:25.000000000 -0600
@@ -154,13 +154,13 @@
$(INSTALL_PROGRAM) $$i $(DESTDIR)$(sbindir)/$$i; \
$(STRIP) $(DESTDIR)$(sbindir)/$$i; \
done
- $(LN) -f $(DESTDIR)$(root_sbindir)/mke2fs \
+ $(LN_S) -f ./mke2fs \
$(DESTDIR)$(root_sbindir)/mkfs.ext2
- $(LN) -f $(DESTDIR)$(root_sbindir)/mke2fs \
+ $(LN_S) -f ./mke2fs \
$(DESTDIR)$(root_sbindir)/mkfs.ext3
- $(LN) -f $(DESTDIR)$(root_sbindir)/tune2fs \
+ $(LN_S) -f ./tune2fs \
$(DESTDIR)$(root_sbindir)/e2label
- $(LN) -f $(DESTDIR)$(root_sbindir)/tune2fs \
+ $(LN_S) -f ./tune2fs \
$(DESTDIR)$(root_sbindir)/findfs
for i in $(UPROGS); do \
$(INSTALL_PROGRAM) $$i $(DESTDIR)$(bindir)/$$i; \
@@ -174,8 +174,8 @@
done
$(RM) -f $(DESTDIR)$(man8dir)/mkfs.ext2.8.gz \
$(DESTDIR)$(man8dir)/mkfs.ext3.8.gz
- $(LN) -f $(DESTDIR)$(man8dir)/mke2fs.8 $(DESTDIR)$(man8dir)/mkfs.ext2.8
- $(LN) -f $(DESTDIR)$(man8dir)/mke2fs.8 $(DESTDIR)$(man8dir)/mkfs.ext3.8
+ $(LN_S) -f ./mke2fs.8 $(DESTDIR)$(man8dir)/mkfs.ext2.8
+ $(LN_S) -f ./mke2fs.8 $(DESTDIR)$(man8dir)/mkfs.ext3.8
for i in $(UMANPAGES); do \
$(RM) -f $(DESTDIR)$(man1dir)/$$i.gz; \
$(INSTALL_DATA) $$i $(DESTDIR)$(man1dir)/$$i; \

2155
meta/packages/e2fsprogs/e2fsprogs/m4.patch
View File

File diff suppressed because it is too large Load Diff

2
meta/packages/e2fsprogs/e2fsprogs_1.41.2.bb
View File

@@ -2,8 +2,6 @@ require e2fsprogs.inc
PR = "r11"
S = "${WORKDIR}/e2fsprogs-${PV}"
SRC_URI += "file://no-hardlinks.patch;patch=1"
PARALLEL_MAKE = ""