1
0
mirror of https://git.yoctoproject.org/poky synced 2026-06-04 02:00:04 +00:00

Rename /openembedded/ -> /meta/

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@530 311d38ba-8fff-0310-9ca6-ca027cbcb966
This commit is contained in:
Richard Purdie
2006-07-21 10:10:31 +00:00
parent 2cf0eadf9f
commit b2f192faab
1725 changed files with 6 additions and 6 deletions
@@ -0,0 +1,82 @@
--- e2fsprogs-1.38/misc/Makefile.in.orig 2005-11-08 23:56:06.000000000 +0100
+++ e2fsprogs-1.38/misc/Makefile.in 2005-11-08 23:59:15.000000000 +0100
@@ -230,17 +230,13 @@
$(INSTALL_PROGRAM) $$i $(DESTDIR)$(sbindir)/$$i; \
done
@echo " LINK $(root_sbindir)/mkfs.ext2"
- @$(LN) -f $(DESTDIR)$(root_sbindir)/mke2fs \
- $(DESTDIR)$(root_sbindir)/mkfs.ext2
+ @(cd $(DESTDIR)$(root_sbindir) && $(LN_S) -f mke2fs mkfs.ext2)
@echo " LINK $(root_sbindir)/mkfs.ext3"
- @$(LN) -f $(DESTDIR)$(root_sbindir)/mke2fs \
- $(DESTDIR)$(root_sbindir)/mkfs.ext3
+ @(cd $(DESTDIR)$(root_sbindir) && $(LN_S) -f mke2fs mkfs.ext3)
@echo " LINK $(root_sbindir)/e2label"
- @$(LN) -f $(DESTDIR)$(root_sbindir)/tune2fs \
- $(DESTDIR)$(root_sbindir)/e2label
+ @(cd $(DESTDIR)$(root_sbindir) && $(LN_S) -f tune2fs e2label)
@echo " LINK $(root_sbindir)/findfs"
- @$(LN) -f $(DESTDIR)$(root_sbindir)/tune2fs \
- $(DESTDIR)$(root_sbindir)/findfs
+ @(cd $(DESTDIR)$(root_sbindir) && $(LN_S) -f tune2fs findfs)
@for i in $(UPROGS); do \
echo " INSTALL $(bindir)/$$i"; \
$(INSTALL_PROGRAM) $$i $(DESTDIR)$(bindir)/$$i; \
@@ -259,11 +255,9 @@
@$(RM) -f $(DESTDIR)$(man8dir)/mkfs.ext2.8.gz \
$(DESTDIR)$(man8dir)/mkfs.ext3.8.gz
@echo " LINK mkfs.ext2.8"
- @$(LN) -f $(DESTDIR)$(man8dir)/mke2fs.8 \
- $(DESTDIR)$(man8dir)/mkfs.ext2.8
+ @(cd $(DESTDIR)$(man8dir) && $(LN_S) -f mke2fs.8 mkfs.ext2.8)
@echo " LINK mkfs.ext3.8"
- @$(LN) -f $(DESTDIR)$(man8dir)/mke2fs.8 \
- $(DESTDIR)$(man8dir)/mkfs.ext3.8
+ @(cd $(DESTDIR)$(man8dir) && $(LN_S) -f mke2fs.8 mkfs.ext3.8)
@for i in $(UMANPAGES); do \
$(RM) -f $(DESTDIR)$(man1dir)/$$i.gz; \
echo " INSTALL_DATA $(man1dir)/$$i"; \
--- e2fsprogs-1.38/lib/uuid/Makefile.in.orig 2005-11-08 23:54:17.000000000 +0100
+++ e2fsprogs-1.38/lib/uuid/Makefile.in 2005-11-08 23:55:51.000000000 +0100
@@ -146,9 +146,9 @@
@$(RM) -f $(DESTDIR)$(man3dir)/uuid_generate_random.3.gz \
$(DESTDIR)$(man3dir)/uuid_generate_time.3.gz
@echo " LINK $(man3dir)/uuid_generate_random.3"
- @$(LN) -f $(DESTDIR)$(man3dir)/uuid_generate.3 $(DESTDIR)$(man3dir)/uuid_generate_random.3
+ @(cd $(DESTDIR)$(man3dir) && $(LN_S) -f uuid_generate.3 uuid_generate_random.3)
@echo " LINK $(man3dir)/uuid_generate_time.3"
- @$(LN) -f $(DESTDIR)$(man3dir)/uuid_generate.3 $(DESTDIR)$(man3dir)/uuid_generate_time.3
+ @(cd $(DESTDIR)$(man3dir) && $(LN_S) -f uuid_generate.3 uuid_generate_time.3)
@echo " INSTALL_DATA $(libdir)/pkgconfig/uuid.pc"
@$(INSTALL_DATA) uuid.pc $(DESTDIR)$(libdir)/pkgconfig/uuid.pc
--- e2fsprogs-1.38/e2fsck/Makefile.in.orig 2005-11-08 23:53:07.000000000 +0100
+++ e2fsprogs-1.38/e2fsck/Makefile.in 2005-11-08 23:53:43.000000000 +0100
@@ -161,11 +161,9 @@
$(INSTALL_PROGRAM) $$i $(DESTDIR)$(root_sbindir)/$$i; \
done
@echo " LINK $(root_sbindir)/fsck.ext2"
- @$(LN) -f $(DESTDIR)$(root_sbindir)/e2fsck \
- $(DESTDIR)$(root_sbindir)/fsck.ext2
+ @(cd $(DESTDIR)$(root_sbindir) && $(LN_S) -f e2fsck fsck.ext2)
@echo " LINK $(root_sbindir)/fsck.ext3"
- @$(LN) -f $(DESTDIR)$(root_sbindir)/e2fsck \
- $(DESTDIR)$(root_sbindir)/fsck.ext3
+ @(cd $(DESTDIR)$(root_sbindir) && $(LN_S) -f e2fsck fsck.ext3)
@for i in $(MANPAGES); do \
for j in $(COMPRESS_EXT); do \
$(RM) -f $(DESTDIR)$(man8dir)/$$i.$$j; \
@@ -174,11 +172,9 @@
$(INSTALL_DATA) $$i $(DESTDIR)$(man8dir)/$$i; \
done
@echo " LINK $(man8dir)/fsck.ext2.8"
- @$(LN) -f $(DESTDIR)$(man8dir)/e2fsck.8 \
- $(DESTDIR)$(man8dir)/fsck.ext2.8
+ @(cd $(DESTDIR)$(man8dir) && $(LN_S) -f e2fsck.8 fsck.ext2.8)
@echo " LINK $(man8dir)/fsck.ext3.8"
- @$(LN) -f $(DESTDIR)$(man8dir)/e2fsck.8 \
- $(DESTDIR)$(man8dir)/fsck.ext3.8
+ @(cd $(DESTDIR)$(man8dir) && $(LN_S) -f e2fsck.8 fsck.ext3.8)
install-strip: install
@for i in $(PROGS); do \
@@ -0,0 +1,16 @@
#
# 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>
@@ -0,0 +1,122 @@
#
# 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
@@ -0,0 +1,18 @@
DESCRIPTION="EXT2 Filesystem Utilities"
SECTION="base"
PRIORITY="optional"
MAINTAINER="Greg Gilbert <greg@treke.net>"
RDEPENDS="libc6"
DEPENDS=virtual/libc
SRC_URI=${SOURCEFORGE_MIRROR}/e2fsprogs/e2fsprogs-${PV}.tar.gz \
file://${FILESDIR}/ln.patch;patch=1 \
file://${FILESDIR}/configure.patch;patch=1 \
file://${FILESDIR}/compile-subst.patch;patch=1 \
file://${FILESDIR}/m4.patch;patch=1
inherit autotools
do_compile_prepend () {
find ./ -print|xargs chmod u=rwX
}
@@ -0,0 +1,27 @@
#
# 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)
@@ -0,0 +1,58 @@
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; \
File diff suppressed because it is too large Load Diff
+50
View File
@@ -0,0 +1,50 @@
DESCRIPTION = "EXT2 Filesystem Utilities"
HOMEPAGE = "http://e2fsprogs.sourceforge.net"
LICENSE = "GPL"
SECTION = "base"
PR = "r6"
SRC_URI = "${SOURCEFORGE_MIRROR}/e2fsprogs/e2fsprogs-${PV}.tar.gz \
file://no-hardlinks.patch;patch=1"
S = "${WORKDIR}/e2fsprogs-${PV}"
inherit autotools
EXTRA_OECONF = "--enable-dynamic-e2fsck --sbindir=${base_sbindir}"
do_compile_prepend () {
find ./ -print|xargs chmod u=rwX
( cd util; ${BUILD_CC} subst.c -o subst )
}
ext2fsheaders = "ext2_ext_attr.h bitops.h ext2_err.h \
ext2_types.h ext2_fs.h ext2_io.h \
ext2fs.h"
e2pheaders = "e2p.h"
do_stage () {
oe_libinstall -a -C lib libe2p ${STAGING_LIBDIR}/
oe_libinstall -a -C lib libext2fs ${STAGING_LIBDIR}/
install -d ${STAGING_INCDIR}/e2p
for h in ${e2pheaders}; do
install -m 0644 lib/e2p/$h ${STAGING_INCDIR}/e2p/ || die "failed to install $h"
done
install -d ${STAGING_INCDIR}/ext2fs
for h in ${ext2fsheaders}; do
install -m 0644 lib/ext2fs/$h ${STAGING_INCDIR}/ext2fs/ || die "failed to install $h"
done
}
# blkid used to be part of e2fsprogs but is useful outside, add it
# as an RDEPENDS so that anything relying on it being in e2fsprogs
# still works
RDEPENDS_e2fsprogs = "e2fsprogs-blkid e2fsprogs-uuidgen e2fsprogs-badblocks"
PACKAGES =+ "e2fsprogs-blkid e2fsprogs-uuidgen e2fsprogs-e2fsck e2fsprogs-mke2fs e2fsprogs-fsck e2fsprogs-tune2fs e2fsprogs-badblocks"
FILES_e2fsprogs-blkid = "${base_sbindir}/blkid"
FILES_e2fsprogs-uuidgen = "${bindir}/uuidgen"
FILES_e2fsprogs-fsck = "${base_sbindir}/fsck"
FILES_e2fsprogs-e2fsck = "${base_sbindir}/e2fsck ${base_sbindir}/fsck.ext*"
FILES_e2fsprogs-mke2fs = "${base_sbindir}/mke2fs ${base_sbindir}/mkfs.ext*"
FILES_e2fsprogs-tune2fs = "${base_sbindir}/tune2fs ${base_sbindir}/e2label ${base_sbindir}/findfs"
FILES_e2fsprogs-badblocks = "${base_sbindir}/badblocks"