diff options
author | Saul Wold <Saul.Wold@intel.com> | 2010-11-22 13:57:13 +0000 |
---|---|---|
committer | Richard Purdie <rpurdie@linux.intel.com> | 2010-11-22 13:57:13 +0000 |
commit | cfe12efb5ec9586dab6961f141d52b103bd8b1d1 (patch) | |
tree | 7108e22aa7ddf6cfc2f1b6c6b73a811187706ecb /meta/recipes-devtools | |
parent | 762fd6b7b3b22d7a8cb80ef9e9ba62e7ef21af3e (diff) | |
download | poky-cfe12efb5ec9586dab6961f141d52b103bd8b1d1.tar.gz |
Meta: Recipe Reogranization
This is the next stage of recipe reorganization, in this stage
many recipes where moved to a new meta-demoapps layer since this
is more appropriate for demo usage then the core. Additional some
recipes were moved to meta-extras to indicate they may be depercated
at a future time.
A number of recipes were modified since dependencies need to be
corrected.
Signed-off-by: Saul Wold <Saul.Wold@intel.com>
Diffstat (limited to 'meta/recipes-devtools')
6 files changed, 93 insertions, 70 deletions
diff --git a/meta/recipes-devtools/dpkg/run-postinsts/run-postinsts b/meta/recipes-devtools/dpkg/run-postinsts/run-postinsts new file mode 100755 index 0000000000..f632d1c7d3 --- /dev/null +++ b/meta/recipes-devtools/dpkg/run-postinsts/run-postinsts | |||
@@ -0,0 +1,36 @@ | |||
1 | #!/bin/sh | ||
2 | # | ||
3 | # Copyright 2007 Openedhand Ltd. | ||
4 | # | ||
5 | # Author: Richard Purdie <rpurdie@openedhand.com> | ||
6 | # | ||
7 | |||
8 | PKGSYSTEM=/var/dpkg | ||
9 | |||
10 | if [ ! -e $PKGSYSTEM/status ]; then | ||
11 | if [ -e /usr/lib/opkg/status ]; then | ||
12 | PKGSYSTEM=/usr/lib/opkg | ||
13 | else | ||
14 | echo "No package system found" | ||
15 | exit 1 | ||
16 | fi | ||
17 | fi | ||
18 | |||
19 | STAMP=$PKGSYSTEM/postinsts-done | ||
20 | STATFILE=$PKGSYSTEM/status | ||
21 | STATFILE2=$PKGSYSTEM/status2 | ||
22 | |||
23 | if [ -e $STAMP ]; then | ||
24 | exit 0 | ||
25 | fi | ||
26 | |||
27 | awk -f /usr/share/run-postinsts/run-postinsts.awk $STATFILE > $STATFILE2 | ||
28 | if [ $? = 0 ]; then | ||
29 | mv $STATFILE2 $STATFILE | ||
30 | touch $STAMP | ||
31 | exit 0 | ||
32 | else | ||
33 | rm -f $STATFILE2 | ||
34 | rm -f $STAMP | ||
35 | exit 1 | ||
36 | fi | ||
diff --git a/meta/recipes-devtools/dpkg/run-postinsts/run-postinsts.awk b/meta/recipes-devtools/dpkg/run-postinsts/run-postinsts.awk new file mode 100644 index 0000000000..09a1400cf4 --- /dev/null +++ b/meta/recipes-devtools/dpkg/run-postinsts/run-postinsts.awk | |||
@@ -0,0 +1,30 @@ | |||
1 | # | ||
2 | # Copyright 2007 Openedhand Ltd. | ||
3 | # | ||
4 | # Author: Richard Purdie <rpurdie@openedhand.com> | ||
5 | # | ||
6 | # Rather hacky proof of concept | ||
7 | # | ||
8 | |||
9 | BEGIN { | ||
10 | rc=system("test -d /usr/dpkg/info/") | ||
11 | if (rc==0) | ||
12 | pkgdir="/var/dpkg/info" | ||
13 | else | ||
14 | pkgdir="/usr/lib/opkg/info" | ||
15 | package="" | ||
16 | } | ||
17 | /Package:.*/ { | ||
18 | package = substr($0, 10) | ||
19 | } | ||
20 | /Status:.*unpacked.*/ { | ||
21 | print "Configuring: " package > "/dev/stderr" | ||
22 | ret = system(pkgdir "/" package ".postinst 1>&2") | ||
23 | if (ret == 0) | ||
24 | $0 = gensub("unpacked", "installed", 1) | ||
25 | else | ||
26 | print "Postinstall failed for " package > "/dev/stderr" | ||
27 | } | ||
28 | { | ||
29 | print $0 | ||
30 | } | ||
diff --git a/meta/recipes-devtools/dpkg/run-postinsts_1.0.bb b/meta/recipes-devtools/dpkg/run-postinsts_1.0.bb new file mode 100644 index 0000000000..44e840ed13 --- /dev/null +++ b/meta/recipes-devtools/dpkg/run-postinsts_1.0.bb | |||
@@ -0,0 +1,27 @@ | |||
1 | DESCRIPTION = "Run postinstall scripts on device using awk" | ||
2 | SECTION = "devel" | ||
3 | PR = "r6" | ||
4 | LICENSE = "MIT" | ||
5 | |||
6 | SRC_URI = "file://run-postinsts file://run-postinsts.awk" | ||
7 | |||
8 | INITSCRIPT_NAME = "run-postinsts" | ||
9 | INITSCRIPT_PARAMS = "start 98 S ." | ||
10 | |||
11 | inherit update-rc.d | ||
12 | |||
13 | do_configure() { | ||
14 | : | ||
15 | } | ||
16 | |||
17 | do_compile () { | ||
18 | : | ||
19 | } | ||
20 | |||
21 | do_install() { | ||
22 | install -d ${D}${sysconfdir}/init.d/ | ||
23 | install -m 0755 ${WORKDIR}/run-postinsts ${D}${sysconfdir}/init.d/ | ||
24 | |||
25 | install -d ${D}${datadir}/${PN}/ | ||
26 | install -m 0644 ${WORKDIR}/run-postinsts.awk ${D}${datadir}/${PN}/ | ||
27 | } | ||
diff --git a/meta/recipes-devtools/exmap-console/exmap-console.inc b/meta/recipes-devtools/exmap-console/exmap-console.inc deleted file mode 100644 index efbd79fce1..0000000000 --- a/meta/recipes-devtools/exmap-console/exmap-console.inc +++ /dev/null | |||
@@ -1,59 +0,0 @@ | |||
1 | DESCRIPTION = "Console based version of exmap, a memory usage analysis tool" | ||
2 | HOMEPAGE = "http://projects.o-hand.com/exmap-console" | ||
3 | SECTION = "devel" | ||
4 | LICENSE = "GPL" | ||
5 | DEPENDS = "virtual/kernel readline glib-2.0" | ||
6 | |||
7 | SRC_URI = "http://projects.o-hand.com/sources/exmap-console/exmap-console-${PV}.tgz" | ||
8 | |||
9 | TEMPPACKAGE_ARCH := "${PACKAGE_ARCH}" | ||
10 | |||
11 | inherit module-base | ||
12 | inherit autotools | ||
13 | |||
14 | PACKAGE_ARCH = "${TEMPPACKAGE_ARCH}" | ||
15 | |||
16 | PACKAGES =+ "exmap-server kernel-module-exmap" | ||
17 | |||
18 | FILES_exmap-console = "${bindir}/exmap ${bindir}/exmapd" | ||
19 | RDEPENDS_exmap-console += "kernel-module-exmap" | ||
20 | |||
21 | FILES_exmap-server = "${bindir}/exmapserver" | ||
22 | RDEPENDS_exmap-server += "kernel-module-exmap" | ||
23 | |||
24 | FILES_kernel-module-exmap = "${base_libdir}" | ||
25 | PACKAGE_ARCH_kernel-module-exmap = "${MACHINE_ARCH}" | ||
26 | RDEPENDS_kernel-module-exmap += "update-modules kernel-image-${KERNEL_VERSION}" | ||
27 | |||
28 | S = "${WORKDIR}/exmap-console-${PV}" | ||
29 | |||
30 | export MODULE_PATH="${D}${base_libdir}/modules/${KERNEL_VERSION}" | ||
31 | |||
32 | do_compile() { | ||
33 | cd ${S}/src | ||
34 | make | ||
35 | |||
36 | cd ${S}/kernel | ||
37 | unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS | ||
38 | oe_runmake KERNEL_PATH=${STAGING_KERNEL_DIR} \ | ||
39 | KERNEL_SRC=${STAGING_KERNEL_DIR} \ | ||
40 | KERNEL_VERSION=${KERNEL_VERSION} \ | ||
41 | CC="${KERNEL_CC}" LD="${KERNEL_LD}" \ | ||
42 | ${MAKE_TARGETS} | ||
43 | } | ||
44 | |||
45 | do_install() { | ||
46 | oe_runmake 'DESTDIR=${D}' 'DEPMOD=/bin/true' install | ||
47 | } | ||
48 | |||
49 | pkg_postinst_append_kernel-module-exmap () { | ||
50 | if [ -n "$D" ]; then | ||
51 | exit 1 | ||
52 | fi | ||
53 | depmod -a | ||
54 | update-modules || true | ||
55 | } | ||
56 | |||
57 | pkg_postrm_append_kernel-module-exmap () { | ||
58 | update-modules || true | ||
59 | } | ||
diff --git a/meta/recipes-devtools/exmap-console/exmap-console_0.4.1.bb b/meta/recipes-devtools/exmap-console/exmap-console_0.4.1.bb deleted file mode 100644 index c76c5c3b4c..0000000000 --- a/meta/recipes-devtools/exmap-console/exmap-console_0.4.1.bb +++ /dev/null | |||
@@ -1,3 +0,0 @@ | |||
1 | require exmap-console.inc | ||
2 | |||
3 | PR = "r8" | ||
diff --git a/meta/recipes-devtools/exmap-console/exmap-console_svn.bb b/meta/recipes-devtools/exmap-console/exmap-console_svn.bb deleted file mode 100644 index ce222854e2..0000000000 --- a/meta/recipes-devtools/exmap-console/exmap-console_svn.bb +++ /dev/null | |||
@@ -1,8 +0,0 @@ | |||
1 | require exmap-console.inc | ||
2 | |||
3 | PV = "0.4+svnr${SRCREV}" | ||
4 | PR = "r5" | ||
5 | |||
6 | SRC_URI = "svn://svn.o-hand.com/repos/misc/trunk;module=exmap-console;proto=http" | ||
7 | |||
8 | S = "${WORKDIR}/exmap-console" | ||