summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/conf/distro/include/poky-fixed-revisions.inc2
-rw-r--r--meta/recipes-devtools/pseudo/pseudo.inc69
-rw-r--r--meta/recipes-devtools/pseudo/pseudo_1.0.bb9
-rw-r--r--meta/recipes-devtools/pseudo/pseudo_git.bb74
4 files changed, 83 insertions, 71 deletions
diff --git a/meta/conf/distro/include/poky-fixed-revisions.inc b/meta/conf/distro/include/poky-fixed-revisions.inc
index b7bd6f9fbb..948608001e 100644
--- a/meta/conf/distro/include/poky-fixed-revisions.inc
+++ b/meta/conf/distro/include/poky-fixed-revisions.inc
@@ -7,6 +7,8 @@ PREFERRED_VERSION_hal ?= "0.5.14"
7PREFERRED_VERSION_hal-info ?= "20091130" 7PREFERRED_VERSION_hal-info ?= "20091130"
8PREFERRED_VERSION_udev ?= "164" 8PREFERRED_VERSION_udev ?= "164"
9PREFERRED_VERSION_wpa-supplicant ?= "0.7.3" 9PREFERRED_VERSION_wpa-supplicant ?= "0.7.3"
10PREFERRED_VERSION_pseudo = "1.0"
11PREFERRED_VERSION_pseudo-native = "1.0"
10 12
11PULSEAUDIOVERSION ?= "0.9.22" 13PULSEAUDIOVERSION ?= "0.9.22"
12PULSEAUDIOVERSION_arm ?= "0.9.15" 14PULSEAUDIOVERSION_arm ?= "0.9.15"
diff --git a/meta/recipes-devtools/pseudo/pseudo.inc b/meta/recipes-devtools/pseudo/pseudo.inc
new file mode 100644
index 0000000000..a458dcce69
--- /dev/null
+++ b/meta/recipes-devtools/pseudo/pseudo.inc
@@ -0,0 +1,69 @@
1DESCRIPTION = "Pseudo gives fake root capabilities to a normal user"
2HOMEPAGE = "http://wiki.github.com/wrpseudo/pseudo/"
3LIC_FILES_CHKSUM = "file://COPYING;md5=243b725d71bb5df4a1e5920b344b86ad"
4SECTION = "base"
5LICENSE = "LGPL2.1"
6DEPENDS = "sqlite3"
7
8FILES_${PN} = "${libdir}/libpseudo.so ${bindir}/* ${localstatedir}/pseudo"
9PROVIDES += "virtual/fakeroot"
10
11inherit siteinfo
12
13do_configure () {
14 :
15}
16
17NO32LIBS ??= "0"
18
19# Compile for the local machine arch...
20do_compile () {
21 ${S}/configure --prefix=${prefix} --with-sqlite=${STAGING_DIR_TARGET}${exec_prefix} --bits=${SITEINFO_BITS}
22 oe_runmake 'LIB=lib/pseudo/lib$(MARK64)'
23}
24
25# Two below are the same
26# If necessary compile for the alternative machine arch. This is only
27# necessary in a native build.
28do_compile_prepend_virtclass-native () {
29 if [ "${SITEINFO_BITS}" == "64" -a -e "/usr/include/gnu/stubs-32.h" -a "${PN}" == "pseudo-native" -a "${NO32LIBS}" != "1" ]; then
30 # We need the 32-bit libpseudo on a 64-bit machine...
31 ./configure --prefix=${prefix} --with-sqlite=${STAGING_DIR_TARGET}${exec_prefix} --bits=32
32 oe_runmake 'CFLAGS=-m32' 'LIB=lib/pseudo/lib' libpseudo
33 # prevent it from removing the lib, but remove everything else
34 make 'LIB=foo' distclean
35 fi
36}
37
38do_compile_prepend_virtclass-nativesdk () {
39 if [ "${SITEINFO_BITS}" == "64" -a -e "/usr/include/gnu/stubs-32.h" -a "${PN}" == "pseudo-native" -a "${NO32LIBS}" != "1" ]; then
40 # We need the 32-bit libpseudo on a 64-bit machine...
41 ./configure --prefix=${prefix} --with-sqlite=${STAGING_DIR_TARGET}${exec_prefix} --bits=32
42 oe_runmake 'CFLAGS=-m32' 'LIB=lib/pseudo/lib' libpseudo
43 # prevent it from removing the lib, but remove everything else
44 make 'LIB=foo' distclean
45 fi
46}
47
48do_install () {
49 oe_runmake 'DESTDIR=${D}' 'LIB=lib/pseudo/lib$(MARK64)' install
50}
51
52# Two below are the same
53# If necessary install for the alternative machine arch. This is only
54# necessary in a native build.
55do_install_append_virtclass-native () {
56 if [ "${SITEINFO_BITS}" == "64" -a -e "/usr/include/gnu/stubs-32.h" -a "${PN}" == "pseudo-native" -a "${NO32LIBS}" != "1" ]; then
57 mkdir -p ${D}${prefix}/lib/pseudo/lib
58 cp lib/pseudo/lib/libpseudo.so ${D}${prefix}/lib/pseudo/lib/.
59 fi
60}
61
62do_install_append_virtclass-nativesdk () {
63 if [ "${SITEINFO_BITS}" == "64" -a -e "/usr/include/gnu/stubs-32.h" -a "${PN}" == "pseudo-native" -a "${NO32LIBS}" != "1" ]; then
64 mkdir -p ${D}${prefix}/lib/pseudo/lib
65 cp lib/pseudo/lib/libpseudo.so ${D}${prefix}/lib/pseudo/lib/.
66 fi
67}
68
69BBCLASSEXTEND = "native nativesdk"
diff --git a/meta/recipes-devtools/pseudo/pseudo_1.0.bb b/meta/recipes-devtools/pseudo/pseudo_1.0.bb
new file mode 100644
index 0000000000..e750e8aebc
--- /dev/null
+++ b/meta/recipes-devtools/pseudo/pseudo_1.0.bb
@@ -0,0 +1,9 @@
1require pseudo.inc
2
3PR = "r0"
4
5SRC_URI = "http://www.yoctoproject.org/downloads/${BPN}/${BPN}-${PV}.tar.bz2 \
6 file://static_sqlite.patch"
7
8SRC_URI[md5sum] = "a329bd00ba78711bcacd48fc1982af6a"
9SRC_URI[sha256sum] = "cb41c97094044144ef4027ab9dbba009f3cb1c23e6bec9640f29d530524ad60f"
diff --git a/meta/recipes-devtools/pseudo/pseudo_git.bb b/meta/recipes-devtools/pseudo/pseudo_git.bb
index 244fabe1eb..8fe311082d 100644
--- a/meta/recipes-devtools/pseudo/pseudo_git.bb
+++ b/meta/recipes-devtools/pseudo/pseudo_git.bb
@@ -1,78 +1,10 @@
1DESCRIPTION = "Pseudo gives fake root capabilities to a normal user" 1require pseudo.inc
2HOMEPAGE = "http://wiki.github.com/wrpseudo/pseudo/"
3LIC_FILES_CHKSUM = "file://COPYING;md5=243b725d71bb5df4a1e5920b344b86ad"
4SECTION = "base"
5LICENSE = "LGPL2.1"
6DEPENDS = "sqlite3"
7 2
8PV = "0.0+git${SRCPV}" 3PV = "1.0+git${SRCPV}"
9PR = "r18" 4PR = "r18"
10 5
11SRC_URI = "git://github.com/wrpseudo/pseudo.git;protocol=git \ 6SRC_URI = "git://github.com/wrpseudo/pseudo.git;protocol=git \
12 file://static_sqlite.patch \ 7 file://static_sqlite.patch"
13 "
14
15FILES_${PN} = "${libdir}/libpseudo.so ${bindir}/* ${localstatedir}/pseudo"
16PROVIDES += "virtual/fakeroot"
17 8
18S = "${WORKDIR}/git" 9S = "${WORKDIR}/git"
19 10
20inherit siteinfo
21
22do_configure () {
23 :
24}
25
26NO32LIBS ??= "0"
27
28# Compile for the local machine arch...
29do_compile () {
30 ${S}/configure --prefix=${prefix} --with-sqlite=${STAGING_DIR_TARGET}${exec_prefix} --bits=${SITEINFO_BITS}
31 oe_runmake 'LIB=lib/pseudo/lib$(MARK64)'
32}
33
34# Two below are the same
35# If necessary compile for the alternative machine arch. This is only
36# necessary in a native build.
37do_compile_prepend_virtclass-native () {
38 if [ "${SITEINFO_BITS}" == "64" -a -e "/usr/include/gnu/stubs-32.h" -a "${PN}" == "pseudo-native" -a "${NO32LIBS}" != "1" ]; then
39 # We need the 32-bit libpseudo on a 64-bit machine...
40 ./configure --prefix=${prefix} --with-sqlite=${STAGING_DIR_TARGET}${exec_prefix} --bits=32
41 oe_runmake 'CFLAGS=-m32' 'LIB=lib/pseudo/lib' libpseudo
42 # prevent it from removing the lib, but remove everything else
43 make 'LIB=foo' distclean
44 fi
45}
46
47do_compile_prepend_virtclass-nativesdk () {
48 if [ "${SITEINFO_BITS}" == "64" -a -e "/usr/include/gnu/stubs-32.h" -a "${PN}" == "pseudo-native" -a "${NO32LIBS}" != "1" ]; then
49 # We need the 32-bit libpseudo on a 64-bit machine...
50 ./configure --prefix=${prefix} --with-sqlite=${STAGING_DIR_TARGET}${exec_prefix} --bits=32
51 oe_runmake 'CFLAGS=-m32' 'LIB=lib/pseudo/lib' libpseudo
52 # prevent it from removing the lib, but remove everything else
53 make 'LIB=foo' distclean
54 fi
55}
56
57do_install () {
58 oe_runmake 'DESTDIR=${D}' 'LIB=lib/pseudo/lib$(MARK64)' install
59}
60
61# Two below are the same
62# If necessary install for the alternative machine arch. This is only
63# necessary in a native build.
64do_install_append_virtclass-native () {
65 if [ "${SITEINFO_BITS}" == "64" -a -e "/usr/include/gnu/stubs-32.h" -a "${PN}" == "pseudo-native" -a "${NO32LIBS}" != "1" ]; then
66 mkdir -p ${D}${prefix}/lib/pseudo/lib
67 cp lib/pseudo/lib/libpseudo.so ${D}${prefix}/lib/pseudo/lib/.
68 fi
69}
70
71do_install_append_virtclass-nativesdk () {
72 if [ "${SITEINFO_BITS}" == "64" -a -e "/usr/include/gnu/stubs-32.h" -a "${PN}" == "pseudo-native" -a "${NO32LIBS}" != "1" ]; then
73 mkdir -p ${D}${prefix}/lib/pseudo/lib
74 cp lib/pseudo/lib/libpseudo.so ${D}${prefix}/lib/pseudo/lib/.
75 fi
76}
77
78BBCLASSEXTEND = "native nativesdk"