diff options
author | Richard Purdie <rpurdie@linux.intel.com> | 2010-08-27 15:14:24 +0100 |
---|---|---|
committer | Richard Purdie <rpurdie@linux.intel.com> | 2010-08-27 15:29:45 +0100 |
commit | 29d6678fd546377459ef75cf54abeef5b969b5cf (patch) | |
tree | 8edd65790e37a00d01c3f203f773fe4b5012db18 /meta/recipes-devtools/pseudo | |
parent | da49de6885ee1bc424e70bc02f21f6ab920efb55 (diff) | |
download | openembedded-core-29d6678fd546377459ef75cf54abeef5b969b5cf.tar.gz openembedded-core-29d6678fd546377459ef75cf54abeef5b969b5cf.tar.bz2 openembedded-core-29d6678fd546377459ef75cf54abeef5b969b5cf.zip |
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/pseudo')
-rw-r--r-- | meta/recipes-devtools/pseudo/pseudo/static_sqlite.patch | 15 | ||||
-rw-r--r-- | meta/recipes-devtools/pseudo/pseudo_git.bb | 47 |
2 files changed, 62 insertions, 0 deletions
diff --git a/meta/recipes-devtools/pseudo/pseudo/static_sqlite.patch b/meta/recipes-devtools/pseudo/pseudo/static_sqlite.patch new file mode 100644 index 0000000000..0a2fa28d79 --- /dev/null +++ b/meta/recipes-devtools/pseudo/pseudo/static_sqlite.patch @@ -0,0 +1,15 @@ +Due to disabling the LD_LIBRARY_PATH handling, we need to use a static +libsqlite. + +diff -ur git.orig/Makefile.in git/Makefile.in +--- git.orig/Makefile.in 2010-07-20 17:13:56.000000000 -0700 ++++ git/Makefile.in 2010-07-20 17:12:14.000000000 -0700 +@@ -45,7 +45,7 @@ + GLOB_PATTERN=guts/*.c + GUTS=$(filter-out "$(GLOB_PATTERN)",$(wildcard $(GLOB_PATTERN))) + +-DBLDFLAGS=-lsqlite3 ++DBLDFLAGS=$(SQLITE)/lib/libsqlite3.a + USE_64=wrapfuncs64.in + + SHOBJS=pseudo_table.o pseudo_util.o diff --git a/meta/recipes-devtools/pseudo/pseudo_git.bb b/meta/recipes-devtools/pseudo/pseudo_git.bb new file mode 100644 index 0000000000..4cb483ea60 --- /dev/null +++ b/meta/recipes-devtools/pseudo/pseudo_git.bb @@ -0,0 +1,47 @@ +DESCRIPTION = "Pseudo gives fake root capabilities to a normal user" +HOMEPAGE = "http://wiki.github.com/wrpseudo/pseudo/" +LIC_FILES_CHKSUM = "file://COPYING;md5=243b725d71bb5df4a1e5920b344b86ad" +SECTION = "base" +LICENSE = "LGPL2.1" +DEPENDS = "sqlite3" + +PV = "0.0+git${SRCPV}" +PR = "r14" + +SRC_URI = "git://github.com/wrpseudo/pseudo.git;protocol=git \ + file://static_sqlite.patch" + +FILES_${PN} = "${libdir}/libpseudo.so ${bindir}/* ${localstatedir}/pseudo" +PROVIDES += "virtual/fakeroot" + +S = "${WORKDIR}/git" + +inherit siteinfo + +do_configure () { + : +} + +do_compile () { + if [ "${SITEINFO_BITS}" == "64" -a -e "/usr/include/gnu/stubs-32.h" -a "${PN}" == "pseudo-native" ]; then + # We need the 32-bit libpseudo on a 64-bit machine... + ./configure --prefix=${prefix} --with-sqlite=${STAGING_DIR_TARGET}${exec_prefix} --bits=32 + oe_runmake 'CFLAGS=-m32' 'LIB=lib/pseudo/lib' libpseudo + # prevent it from removing the lib, but remove everything else + make 'LIB=foo' distclean + fi + ${S}/configure --prefix=${prefix} --with-sqlite=${STAGING_DIR_TARGET}${exec_prefix} --bits=${SITEINFO_BITS} + oe_runmake 'LIB=lib/pseudo/lib$(MARK64)' +} + +do_install () { + oe_runmake 'DESTDIR=${D}' 'LIB=lib/pseudo/lib$(MARK64)' install + if [ "${SITEINFO_BITS}" == "64" -a -e "/usr/include/gnu/stubs-32.h" -a "${PN}" == "pseudo-native" ]; then + mkdir -p ${D}${prefix}/lib/pseudo/lib + cp lib/pseudo/lib/libpseudo.so ${D}${prefix}/lib/pseudo/lib/. + fi +} + +BBCLASSEXTEND = "native nativesdk" + + |