mirror of
https://git.yoctoproject.org/poky
synced 2026-09-19 09:49:33 +02:00
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>
This commit is contained in:
Richard Purdie
@@ -0,0 +1,86 @@
|
||||
# Extracted from the package's shipped aclocal.m4. Custom macros should be in
|
||||
# acinclude.m4 so running aclocal doesn't blow them away.
|
||||
#
|
||||
# RP 1/6/2010
|
||||
|
||||
# ===========================================================================
|
||||
# http://www.nongnu.org/autoconf-archive/check_gnu_make.html
|
||||
# ===========================================================================
|
||||
#
|
||||
# SYNOPSIS
|
||||
#
|
||||
# CHECK_GNU_MAKE()
|
||||
#
|
||||
# DESCRIPTION
|
||||
#
|
||||
# This macro searches for a GNU version of make. If a match is found, the
|
||||
# makefile variable `ifGNUmake' is set to the empty string, otherwise it
|
||||
# is set to "#". This is useful for including a special features in a
|
||||
# Makefile, which cannot be handled by other versions of make. The
|
||||
# variable _cv_gnu_make_command is set to the command to invoke GNU make
|
||||
# if it exists, the empty string otherwise.
|
||||
#
|
||||
# Here is an example of its use:
|
||||
#
|
||||
# Makefile.in might contain:
|
||||
#
|
||||
# # A failsafe way of putting a dependency rule into a makefile
|
||||
# $(DEPEND):
|
||||
# $(CC) -MM $(srcdir)/*.c > $(DEPEND)
|
||||
#
|
||||
# @ifGNUmake@ ifeq ($(DEPEND),$(wildcard $(DEPEND)))
|
||||
# @ifGNUmake@ include $(DEPEND)
|
||||
# @ifGNUmake@ endif
|
||||
#
|
||||
# Then configure.in would normally contain:
|
||||
#
|
||||
# CHECK_GNU_MAKE()
|
||||
# AC_OUTPUT(Makefile)
|
||||
#
|
||||
# Then perhaps to cause gnu make to override any other make, we could do
|
||||
# something like this (note that GNU make always looks for GNUmakefile
|
||||
# first):
|
||||
#
|
||||
# if ! test x$_cv_gnu_make_command = x ; then
|
||||
# mv Makefile GNUmakefile
|
||||
# echo .DEFAULT: > Makefile ;
|
||||
# echo \ $_cv_gnu_make_command \$@ >> Makefile;
|
||||
# fi
|
||||
#
|
||||
# Then, if any (well almost any) other make is called, and GNU make also
|
||||
# exists, then the other make wraps the GNU make.
|
||||
#
|
||||
# LICENSE
|
||||
#
|
||||
# Copyright (c) 2008 John Darrington <j.darrington@elvis.murdoch.edu.au>
|
||||
#
|
||||
# Copying and distribution of this file, with or without modification, are
|
||||
# permitted in any medium without royalty provided the copyright notice
|
||||
# and this notice are preserved.
|
||||
#
|
||||
# Note: Modified by Ted Ts'o to add @ifNotGNUMake@
|
||||
|
||||
AC_DEFUN(
|
||||
[CHECK_GNU_MAKE], [ AC_CACHE_CHECK( for GNU make,_cv_gnu_make_command,
|
||||
_cv_gnu_make_command='' ;
|
||||
dnl Search all the common names for GNU make
|
||||
for a in "$MAKE" make gmake gnumake ; do
|
||||
if test -z "$a" ; then continue ; fi ;
|
||||
if ( sh -c "$a --version" 2> /dev/null | grep GNU 2>&1 > /dev/null ) ; then
|
||||
_cv_gnu_make_command=$a ;
|
||||
break;
|
||||
fi
|
||||
done ;
|
||||
) ;
|
||||
dnl If there was a GNU version, then set @ifGNUmake@ to the empty string, '#' otherwise
|
||||
if test "x$_cv_gnu_make_command" != "x" ; then
|
||||
ifGNUmake='' ;
|
||||
ifNotGNUmake='#' ;
|
||||
else
|
||||
ifGNUmake='#' ;
|
||||
ifNotGNUmake='' ;
|
||||
AC_MSG_RESULT("Not found");
|
||||
fi
|
||||
AC_SUBST(ifGNUmake)
|
||||
AC_SUBST(ifNotGNUmake)
|
||||
] )
|
||||
@@ -0,0 +1,26 @@
|
||||
Index: e2fsprogs-1.41.5/po/Makefile.in.in
|
||||
===================================================================
|
||||
--- e2fsprogs-1.41.5.orig/po/Makefile.in.in 2009-02-14 13:49:08.000000000 +0000
|
||||
+++ e2fsprogs-1.41.5/po/Makefile.in.in 2009-08-19 17:52:31.000000000 +0100
|
||||
@@ -30,7 +30,7 @@
|
||||
INSTALL = @INSTALL@
|
||||
INSTALL_DATA = @INSTALL_DATA@
|
||||
MKINSTALLDIRS = @MKINSTALLDIRS@
|
||||
-mkinstalldirs = $(SHELL) $(MKINSTALLDIRS)
|
||||
+mkinstalldirs = $(MKINSTALLDIRS)
|
||||
|
||||
GMSGFMT = @GMSGFMT@
|
||||
MSGFMT = @MSGFMT@
|
||||
Index: e2fsprogs-1.41.5/configure.in
|
||||
===================================================================
|
||||
--- e2fsprogs-1.41.5.orig/configure.in 2009-08-19 17:53:50.000000000 +0100
|
||||
+++ e2fsprogs-1.41.5/configure.in 2009-08-19 17:48:38.000000000 +0100
|
||||
@@ -970,6 +970,8 @@
|
||||
fi
|
||||
AC_SUBST(BUILD_CFLAGS)
|
||||
AC_SUBST(BUILD_LDFLAGS)
|
||||
+MKINSTALLDIRS="mkdir -p"
|
||||
+AC_SUBST(MKINSTALLDIRS)
|
||||
dnl
|
||||
dnl Make our output files, being sure that we create the some miscellaneous
|
||||
dnl directories
|
||||
@@ -0,0 +1,43 @@
|
||||
These macros are underquoted and break with recent autoconf+automake
|
||||
combinations.
|
||||
|
||||
RP 1/2/10
|
||||
|
||||
Index: e2fsprogs-1.41.5/configure.in
|
||||
===================================================================
|
||||
--- e2fsprogs-1.41.5.orig/configure.in 2010-02-01 11:40:10.547790252 +0000
|
||||
+++ e2fsprogs-1.41.5/configure.in 2010-02-01 11:44:51.577876485 +0000
|
||||
@@ -397,11 +397,11 @@
|
||||
AC_MSG_ERROR([pkg-config not installed; please install it.])
|
||||
fi
|
||||
|
||||
- AC_CHECK_LIB(blkid, blkid_get_cache,
|
||||
+ [AC_CHECK_LIB(blkid, blkid_get_cache,
|
||||
[LIBBLKID=`$PKG_CONFIG --libs blkid`;
|
||||
STATIC_LIBBLKID=`$PKG_CONFIG --static --libs blkid`],
|
||||
[AC_MSG_ERROR([external blkid library not found])],
|
||||
- [$LIBBLKID])
|
||||
+ [$LIBBLKID])]
|
||||
BLKID_CMT=#
|
||||
AC_MSG_RESULT([Disabling private blkid library])
|
||||
else
|
||||
@@ -786,15 +786,15 @@
|
||||
dnl
|
||||
SEM_INIT_LIB=''
|
||||
AC_CHECK_FUNC(sem_init, ,
|
||||
- AC_CHECK_LIB(pthread, sem_init,
|
||||
+ [AC_CHECK_LIB(pthread, sem_init,
|
||||
AC_DEFINE(HAVE_SEM_INIT)
|
||||
SEM_INIT_LIB=-lpthread,
|
||||
- AC_CHECK_LIB(rt, sem_init,
|
||||
+ [AC_CHECK_LIB(rt, sem_init,
|
||||
AC_DEFINE(HAVE_SEM_INIT)
|
||||
SEM_INIT_LIB=-lrt,
|
||||
- AC_CHECK_LIB(posix4, sem_init,
|
||||
+ [AC_CHECK_LIB(posix4, sem_init,
|
||||
AC_DEFINE(HAVE_SEM_INIT)
|
||||
- SEM_INIT_LIB=-lposix4))))dnl
|
||||
+ SEM_INIT_LIB=-lposix4)])])])dnl
|
||||
AC_SUBST(SEM_INIT_LIB)
|
||||
dnl
|
||||
dnl Check for unified diff
|
||||
25
meta/recipes-devtools/e2fsprogs/e2fsprogs.inc
Normal file
25
meta/recipes-devtools/e2fsprogs/e2fsprogs.inc
Normal file
@@ -0,0 +1,25 @@
|
||||
DESCRIPTION = "The Ext2 Filesystem Utilities (e2fsprogs) contain all of the standard utilities for creating, fixing, configuring , and debugging ext2 filesystems."
|
||||
HOMEPAGE = "http://e2fsprogs.sourceforge.net/"
|
||||
|
||||
LICENSE = "GPLv2 & LGPLv2 & BSD & MIT"
|
||||
LICENSE_e2fsprogs-blkid = "LGPLv2"
|
||||
LICENSE_e2fsprogs-e2fsck = "GPLv2"
|
||||
LICENSE_e2fsprogs-mke2fs = "GPLv2"
|
||||
LICENSE_e2fsprogs-fsck = "GPLv2"
|
||||
LICENSE_e2fsprogs-tune2fs = "GPLv2"
|
||||
LICENSE_e2fsprogs-badblocks = "GPLv2"
|
||||
LIC_FILES_CHKSUM = "file://COPYING;md5=b48f21d765b875bd10400975d12c1ca2 \
|
||||
file://lib/ext2fs/ext2fs.h;beginline=1;endline=9;md5=596a8dedcb4e731c6b21c7a46fba6bef \
|
||||
file://lib/e2p/e2p.h;beginline=1;endline=7;md5=8a74ade8f9d65095d70ef2d4bf48e36a \
|
||||
file://lib/uuid/uuid.h.in;beginline=1;endline=32;md5=dbb8079e114a5f841934b99e59c8820a \
|
||||
file://lib/uuid/COPYING;md5=58dcd8452651fc8b07d1f65ce07ca8af \
|
||||
file://lib/et/et_name.c;beginline=1;endline=11;md5=ead236447dac7b980dbc5b4804d8c836 \
|
||||
file://lib/ss/ss.h;beginline=1;endline=20;md5=6e89ad47da6e75fecd2b5e0e81e1d4a6"
|
||||
SECTION = "base"
|
||||
DEPENDS = "gettext util-linux"
|
||||
|
||||
SRC_URI = "${SOURCEFORGE_MIRROR}/e2fsprogs/e2fsprogs-${PV}.tar.gz \
|
||||
file://mkdir.patch;apply=yes"
|
||||
|
||||
inherit autotools
|
||||
|
||||
46
meta/recipes-devtools/e2fsprogs/e2fsprogs_1.41.12.bb
Normal file
46
meta/recipes-devtools/e2fsprogs/e2fsprogs_1.41.12.bb
Normal file
@@ -0,0 +1,46 @@
|
||||
require e2fsprogs.inc
|
||||
|
||||
PR = "r19"
|
||||
|
||||
SRC_URI += "file://quotefix.patch;patch=1 \
|
||||
file://acinclude.m4"
|
||||
#file://no-hardlinks.patch;patch=1 \
|
||||
|
||||
PARALLEL_MAKE = ""
|
||||
|
||||
EXTRA_OECONF += " --sbindir=${base_sbindir} --enable-elf-shlibs --disable-libuuid"
|
||||
EXTRA_OECONF_darwin = "--sbindir=${base_sbindir} --enable-bsd-shlibs"
|
||||
EXTRA_OECONF_darwin8 = "--sbindir=${base_sbindir} --enable-bsd-shlibs"
|
||||
|
||||
do_configure_prepend () {
|
||||
cp ${WORKDIR}/acinclude.m4 ${S}/
|
||||
}
|
||||
|
||||
do_compile_prepend () {
|
||||
find ./ -print|xargs chmod u=rwX
|
||||
( cd util; ${BUILD_CC} subst.c -o subst )
|
||||
}
|
||||
|
||||
do_install () {
|
||||
oe_runmake 'DESTDIR=${D}' install
|
||||
oe_runmake 'DESTDIR=${D}' install-libs
|
||||
# We use blkid from util-linux now so remove from here
|
||||
rm -f ${D}${libdir}/libblkid*
|
||||
rm -rf ${D}${includedir}/blkid
|
||||
rm -f ${D}${libdir}/pkgconfig/blkid.pc
|
||||
}
|
||||
|
||||
# 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-badblocks"
|
||||
|
||||
PACKAGES =+ "e2fsprogs-blkid e2fsprogs-e2fsck e2fsprogs-mke2fs e2fsprogs-fsck e2fsprogs-tune2fs e2fsprogs-badblocks"
|
||||
FILES_e2fsprogs-blkid = "${base_sbindir}/blkid"
|
||||
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"
|
||||
|
||||
BBCLASSEXTEND = "native"
|
||||
Reference in New Issue
Block a user