summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/e2fsprogs
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2010-08-27 15:14:24 +0100
committerRichard Purdie <rpurdie@linux.intel.com>2010-08-27 15:29:45 +0100
commit29d6678fd546377459ef75cf54abeef5b969b5cf (patch)
tree8edd65790e37a00d01c3f203f773fe4b5012db18 /meta/recipes-devtools/e2fsprogs
parentda49de6885ee1bc424e70bc02f21f6ab920efb55 (diff)
downloadpoky-29d6678fd546377459ef75cf54abeef5b969b5cf.tar.gz
Major layout change to the packages directory
Having one monolithic packages directory makes it hard to find things and is generally overwhelming. This commit splits it into several logical sections roughly based on function, recipes.txt gives more information about the classifications used. The opportunity is also used to switch from "packages" to "recipes" as used in OpenEmbedded as the term "packages" can be confusing to people and has many different meanings. Not all recipes have been classified yet, this is just a first pass at separating things out. Some packages are moved to meta-extras as they're no longer actively used or maintained. Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'meta/recipes-devtools/e2fsprogs')
-rw-r--r--meta/recipes-devtools/e2fsprogs/e2fsprogs-1.41.12/acinclude.m486
-rw-r--r--meta/recipes-devtools/e2fsprogs/e2fsprogs-1.41.12/mkdir.patch26
-rw-r--r--meta/recipes-devtools/e2fsprogs/e2fsprogs-1.41.12/quotefix.patch43
-rw-r--r--meta/recipes-devtools/e2fsprogs/e2fsprogs.inc25
-rw-r--r--meta/recipes-devtools/e2fsprogs/e2fsprogs_1.41.12.bb46
5 files changed, 226 insertions, 0 deletions
diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs-1.41.12/acinclude.m4 b/meta/recipes-devtools/e2fsprogs/e2fsprogs-1.41.12/acinclude.m4
new file mode 100644
index 0000000000..4b00668476
--- /dev/null
+++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs-1.41.12/acinclude.m4
@@ -0,0 +1,86 @@
1# Extracted from the package's shipped aclocal.m4. Custom macros should be in
2# acinclude.m4 so running aclocal doesn't blow them away.
3#
4# RP 1/6/2010
5
6# ===========================================================================
7# http://www.nongnu.org/autoconf-archive/check_gnu_make.html
8# ===========================================================================
9#
10# SYNOPSIS
11#
12# CHECK_GNU_MAKE()
13#
14# DESCRIPTION
15#
16# This macro searches for a GNU version of make. If a match is found, the
17# makefile variable `ifGNUmake' is set to the empty string, otherwise it
18# is set to "#". This is useful for including a special features in a
19# Makefile, which cannot be handled by other versions of make. The
20# variable _cv_gnu_make_command is set to the command to invoke GNU make
21# if it exists, the empty string otherwise.
22#
23# Here is an example of its use:
24#
25# Makefile.in might contain:
26#
27# # A failsafe way of putting a dependency rule into a makefile
28# $(DEPEND):
29# $(CC) -MM $(srcdir)/*.c > $(DEPEND)
30#
31# @ifGNUmake@ ifeq ($(DEPEND),$(wildcard $(DEPEND)))
32# @ifGNUmake@ include $(DEPEND)
33# @ifGNUmake@ endif
34#
35# Then configure.in would normally contain:
36#
37# CHECK_GNU_MAKE()
38# AC_OUTPUT(Makefile)
39#
40# Then perhaps to cause gnu make to override any other make, we could do
41# something like this (note that GNU make always looks for GNUmakefile
42# first):
43#
44# if ! test x$_cv_gnu_make_command = x ; then
45# mv Makefile GNUmakefile
46# echo .DEFAULT: > Makefile ;
47# echo \ $_cv_gnu_make_command \$@ >> Makefile;
48# fi
49#
50# Then, if any (well almost any) other make is called, and GNU make also
51# exists, then the other make wraps the GNU make.
52#
53# LICENSE
54#
55# Copyright (c) 2008 John Darrington <j.darrington@elvis.murdoch.edu.au>
56#
57# Copying and distribution of this file, with or without modification, are
58# permitted in any medium without royalty provided the copyright notice
59# and this notice are preserved.
60#
61# Note: Modified by Ted Ts'o to add @ifNotGNUMake@
62
63AC_DEFUN(
64 [CHECK_GNU_MAKE], [ AC_CACHE_CHECK( for GNU make,_cv_gnu_make_command,
65 _cv_gnu_make_command='' ;
66dnl Search all the common names for GNU make
67 for a in "$MAKE" make gmake gnumake ; do
68 if test -z "$a" ; then continue ; fi ;
69 if ( sh -c "$a --version" 2> /dev/null | grep GNU 2>&1 > /dev/null ) ; then
70 _cv_gnu_make_command=$a ;
71 break;
72 fi
73 done ;
74 ) ;
75dnl If there was a GNU version, then set @ifGNUmake@ to the empty string, '#' otherwise
76 if test "x$_cv_gnu_make_command" != "x" ; then
77 ifGNUmake='' ;
78 ifNotGNUmake='#' ;
79 else
80 ifGNUmake='#' ;
81 ifNotGNUmake='' ;
82 AC_MSG_RESULT("Not found");
83 fi
84 AC_SUBST(ifGNUmake)
85 AC_SUBST(ifNotGNUmake)
86] )
diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs-1.41.12/mkdir.patch b/meta/recipes-devtools/e2fsprogs/e2fsprogs-1.41.12/mkdir.patch
new file mode 100644
index 0000000000..b0577e3bcb
--- /dev/null
+++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs-1.41.12/mkdir.patch
@@ -0,0 +1,26 @@
1Index: e2fsprogs-1.41.5/po/Makefile.in.in
2===================================================================
3--- e2fsprogs-1.41.5.orig/po/Makefile.in.in 2009-02-14 13:49:08.000000000 +0000
4+++ e2fsprogs-1.41.5/po/Makefile.in.in 2009-08-19 17:52:31.000000000 +0100
5@@ -30,7 +30,7 @@
6 INSTALL = @INSTALL@
7 INSTALL_DATA = @INSTALL_DATA@
8 MKINSTALLDIRS = @MKINSTALLDIRS@
9-mkinstalldirs = $(SHELL) $(MKINSTALLDIRS)
10+mkinstalldirs = $(MKINSTALLDIRS)
11
12 GMSGFMT = @GMSGFMT@
13 MSGFMT = @MSGFMT@
14Index: e2fsprogs-1.41.5/configure.in
15===================================================================
16--- e2fsprogs-1.41.5.orig/configure.in 2009-08-19 17:53:50.000000000 +0100
17+++ e2fsprogs-1.41.5/configure.in 2009-08-19 17:48:38.000000000 +0100
18@@ -970,6 +970,8 @@
19 fi
20 AC_SUBST(BUILD_CFLAGS)
21 AC_SUBST(BUILD_LDFLAGS)
22+MKINSTALLDIRS="mkdir -p"
23+AC_SUBST(MKINSTALLDIRS)
24 dnl
25 dnl Make our output files, being sure that we create the some miscellaneous
26 dnl directories
diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs-1.41.12/quotefix.patch b/meta/recipes-devtools/e2fsprogs/e2fsprogs-1.41.12/quotefix.patch
new file mode 100644
index 0000000000..528e319d84
--- /dev/null
+++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs-1.41.12/quotefix.patch
@@ -0,0 +1,43 @@
1These macros are underquoted and break with recent autoconf+automake
2combinations.
3
4RP 1/2/10
5
6Index: e2fsprogs-1.41.5/configure.in
7===================================================================
8--- e2fsprogs-1.41.5.orig/configure.in 2010-02-01 11:40:10.547790252 +0000
9+++ e2fsprogs-1.41.5/configure.in 2010-02-01 11:44:51.577876485 +0000
10@@ -397,11 +397,11 @@
11 AC_MSG_ERROR([pkg-config not installed; please install it.])
12 fi
13
14- AC_CHECK_LIB(blkid, blkid_get_cache,
15+ [AC_CHECK_LIB(blkid, blkid_get_cache,
16 [LIBBLKID=`$PKG_CONFIG --libs blkid`;
17 STATIC_LIBBLKID=`$PKG_CONFIG --static --libs blkid`],
18 [AC_MSG_ERROR([external blkid library not found])],
19- [$LIBBLKID])
20+ [$LIBBLKID])]
21 BLKID_CMT=#
22 AC_MSG_RESULT([Disabling private blkid library])
23 else
24@@ -786,15 +786,15 @@
25 dnl
26 SEM_INIT_LIB=''
27 AC_CHECK_FUNC(sem_init, ,
28- AC_CHECK_LIB(pthread, sem_init,
29+ [AC_CHECK_LIB(pthread, sem_init,
30 AC_DEFINE(HAVE_SEM_INIT)
31 SEM_INIT_LIB=-lpthread,
32- AC_CHECK_LIB(rt, sem_init,
33+ [AC_CHECK_LIB(rt, sem_init,
34 AC_DEFINE(HAVE_SEM_INIT)
35 SEM_INIT_LIB=-lrt,
36- AC_CHECK_LIB(posix4, sem_init,
37+ [AC_CHECK_LIB(posix4, sem_init,
38 AC_DEFINE(HAVE_SEM_INIT)
39- SEM_INIT_LIB=-lposix4))))dnl
40+ SEM_INIT_LIB=-lposix4)])])])dnl
41 AC_SUBST(SEM_INIT_LIB)
42 dnl
43 dnl Check for unified diff
diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs.inc b/meta/recipes-devtools/e2fsprogs/e2fsprogs.inc
new file mode 100644
index 0000000000..a107178514
--- /dev/null
+++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs.inc
@@ -0,0 +1,25 @@
1DESCRIPTION = "The Ext2 Filesystem Utilities (e2fsprogs) contain all of the standard utilities for creating, fixing, configuring , and debugging ext2 filesystems."
2HOMEPAGE = "http://e2fsprogs.sourceforge.net/"
3
4LICENSE = "GPLv2 & LGPLv2 & BSD & MIT"
5LICENSE_e2fsprogs-blkid = "LGPLv2"
6LICENSE_e2fsprogs-e2fsck = "GPLv2"
7LICENSE_e2fsprogs-mke2fs = "GPLv2"
8LICENSE_e2fsprogs-fsck = "GPLv2"
9LICENSE_e2fsprogs-tune2fs = "GPLv2"
10LICENSE_e2fsprogs-badblocks = "GPLv2"
11LIC_FILES_CHKSUM = "file://COPYING;md5=b48f21d765b875bd10400975d12c1ca2 \
12 file://lib/ext2fs/ext2fs.h;beginline=1;endline=9;md5=596a8dedcb4e731c6b21c7a46fba6bef \
13 file://lib/e2p/e2p.h;beginline=1;endline=7;md5=8a74ade8f9d65095d70ef2d4bf48e36a \
14 file://lib/uuid/uuid.h.in;beginline=1;endline=32;md5=dbb8079e114a5f841934b99e59c8820a \
15 file://lib/uuid/COPYING;md5=58dcd8452651fc8b07d1f65ce07ca8af \
16 file://lib/et/et_name.c;beginline=1;endline=11;md5=ead236447dac7b980dbc5b4804d8c836 \
17 file://lib/ss/ss.h;beginline=1;endline=20;md5=6e89ad47da6e75fecd2b5e0e81e1d4a6"
18SECTION = "base"
19DEPENDS = "gettext util-linux"
20
21SRC_URI = "${SOURCEFORGE_MIRROR}/e2fsprogs/e2fsprogs-${PV}.tar.gz \
22 file://mkdir.patch;apply=yes"
23
24inherit autotools
25
diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.41.12.bb b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.41.12.bb
new file mode 100644
index 0000000000..15c80478f5
--- /dev/null
+++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.41.12.bb
@@ -0,0 +1,46 @@
1require e2fsprogs.inc
2
3PR = "r19"
4
5SRC_URI += "file://quotefix.patch;patch=1 \
6 file://acinclude.m4"
7#file://no-hardlinks.patch;patch=1 \
8
9PARALLEL_MAKE = ""
10
11EXTRA_OECONF += " --sbindir=${base_sbindir} --enable-elf-shlibs --disable-libuuid"
12EXTRA_OECONF_darwin = "--sbindir=${base_sbindir} --enable-bsd-shlibs"
13EXTRA_OECONF_darwin8 = "--sbindir=${base_sbindir} --enable-bsd-shlibs"
14
15do_configure_prepend () {
16 cp ${WORKDIR}/acinclude.m4 ${S}/
17}
18
19do_compile_prepend () {
20 find ./ -print|xargs chmod u=rwX
21 ( cd util; ${BUILD_CC} subst.c -o subst )
22}
23
24do_install () {
25 oe_runmake 'DESTDIR=${D}' install
26 oe_runmake 'DESTDIR=${D}' install-libs
27 # We use blkid from util-linux now so remove from here
28 rm -f ${D}${libdir}/libblkid*
29 rm -rf ${D}${includedir}/blkid
30 rm -f ${D}${libdir}/pkgconfig/blkid.pc
31}
32
33# blkid used to be part of e2fsprogs but is useful outside, add it
34# as an RDEPENDS so that anything relying on it being in e2fsprogs
35# still works
36RDEPENDS_e2fsprogs = "e2fsprogs-blkid e2fsprogs-badblocks"
37
38PACKAGES =+ "e2fsprogs-blkid e2fsprogs-e2fsck e2fsprogs-mke2fs e2fsprogs-fsck e2fsprogs-tune2fs e2fsprogs-badblocks"
39FILES_e2fsprogs-blkid = "${base_sbindir}/blkid"
40FILES_e2fsprogs-fsck = "${base_sbindir}/fsck"
41FILES_e2fsprogs-e2fsck = "${base_sbindir}/e2fsck ${base_sbindir}/fsck.ext*"
42FILES_e2fsprogs-mke2fs = "${base_sbindir}/mke2fs ${base_sbindir}/mkfs.ext*"
43FILES_e2fsprogs-tune2fs = "${base_sbindir}/tune2fs ${base_sbindir}/e2label ${base_sbindir}/findfs"
44FILES_e2fsprogs-badblocks = "${base_sbindir}/badblocks"
45
46BBCLASSEXTEND = "native"