diff options
| author | Marcin Juszkiewicz <hrw@openedhand.com> | 2007-10-25 11:30:38 +0000 |
|---|---|---|
| committer | Marcin Juszkiewicz <hrw@openedhand.com> | 2007-10-25 11:30:38 +0000 |
| commit | 52b64ddf61a38940e5ae7675f9dfedc3253e39cc (patch) | |
| tree | 638410e3a8fa54dcf643333f0f34204920636ca6 | |
| parent | 32d6f2166fa25c41a3faf54c18120ac12f3540d7 (diff) | |
| download | openembedded-core-52b64ddf61a38940e5ae7675f9dfedc3253e39cc.tar.gz openembedded-core-52b64ddf61a38940e5ae7675f9dfedc3253e39cc.tar.bz2 openembedded-core-52b64ddf61a38940e5ae7675f9dfedc3253e39cc.zip | |
apmd: sync with OE (removal of /usr/src/linux include dirs)
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@2958 311d38ba-8fff-0310-9ca6-ca027cbcb966
| -rw-r--r-- | meta/packages/apmd/apmd-3.2.2/unlinux.patch | 12 | ||||
| -rw-r--r-- | meta/packages/apmd/apmd_3.2.2.bb | 4 |
2 files changed, 15 insertions, 1 deletions
diff --git a/meta/packages/apmd/apmd-3.2.2/unlinux.patch b/meta/packages/apmd/apmd-3.2.2/unlinux.patch new file mode 100644 index 0000000000..f7eec6eb03 --- /dev/null +++ b/meta/packages/apmd/apmd-3.2.2/unlinux.patch @@ -0,0 +1,12 @@ +--- apmd-3.2.2.orig/Makefile ++++ apmd-3.2.2/Makefile +@@ -43,8 +43,7 @@ + + CC=gcc + CFLAGS=-O -g +-XTRACFLAGS=-Wall -pipe -I. -I/usr/src/linux/include \ +- -I/usr/src/linux-2.2/include -I /usr/src/linux-2.0/include \ ++XTRACFLAGS=-Wall -pipe -I. \ + -DVERSION=\"$(VERSION)\" \ + -DDEFAULT_PROXY_NAME=\"$(PROXY_DIR)/apmd_proxy\" + LDFLAGS= diff --git a/meta/packages/apmd/apmd_3.2.2.bb b/meta/packages/apmd/apmd_3.2.2.bb index 94541581d3..f7efb065e1 100644 --- a/meta/packages/apmd/apmd_3.2.2.bb +++ b/meta/packages/apmd/apmd_3.2.2.bb @@ -3,12 +3,13 @@ SECTION = "base" PRIORITY = "required" DEPENDS = "libtool-cross" LICENSE = "GPL" -PR = "r7" +PR = "r8" SRC_URI = "${DEBIAN_MIRROR}/main/a/apmd/apmd_${PV}.orig.tar.gz; \ file://debian.patch;patch=1 \ file://workaround.patch;patch=1 \ file://zaurus24.patch;patch=1 \ + file://unlinux.patch;patch=1 \ file://init \ file://default \ file://apmd_proxy \ @@ -44,6 +45,7 @@ do_install() { install -d ${D}${bindir} install -d ${D}${libdir} install -d ${D}${datadir}/apmd + install -d ${D}${includedir} install -m 4755 ${S}/.libs/apm ${D}${bindir}/apm install -m 0755 ${S}/.libs/apmd ${D}${sbindir}/apmd |