summaryrefslogtreecommitdiff
path: root/packages
diff options
context:
space:
mode:
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2007-09-24 10:25:53 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2007-09-24 10:25:53 +0000
commit44db427349cb05a96d204f4fa0b41503b3181fef (patch)
treef72ed0060629dd0775b0bfc9e00b357e1f45067e /packages
parentd98b11b82503e616d61b4c4b0e4b02fa429630dd (diff)
parentf124beadbda6de28f49a26b78bcdf047ceb1a677 (diff)
merge of '69a79125da9281a2071776d84dc73c20ae8dbf97'
and '9290de30e8c2f0306df4a03b4cd3c484bbd8ba6b'
Diffstat (limited to 'packages')
-rw-r--r--packages/networkmanager/networkmanager.inc8
-rw-r--r--packages/ppp/ppp_2.4.3.bb6
2 files changed, 6 insertions, 8 deletions
diff --git a/packages/networkmanager/networkmanager.inc b/packages/networkmanager/networkmanager.inc
index e11a52391d..ce819d64ac 100644
--- a/packages/networkmanager/networkmanager.inc
+++ b/packages/networkmanager/networkmanager.inc
@@ -54,13 +54,7 @@ FILES_libnmutil += "${libdir}/libnm-util.so.*"
FILES_libnmglib += "${libdir}/libnm_glib.so.*"
FILES_${PN} += "${datadir} \
- ${sbindir}/* \
- ${bindir}/* \
- ${sysconfdir} \
${libexecdir}"
-FILES_${PN}-dev += "${incdir} \
- ${libdir}/*.a \
- ${libdir}/*.la \
- ${libdir}/pkgconfig"
+FILES_${PN}-dev += " ${datadir}/NetworkManager/gdb-cmd "
diff --git a/packages/ppp/ppp_2.4.3.bb b/packages/ppp/ppp_2.4.3.bb
index 98a7251a7e..71c68c2fb8 100644
--- a/packages/ppp/ppp_2.4.3.bb
+++ b/packages/ppp/ppp_2.4.3.bb
@@ -3,7 +3,7 @@ DESCRIPTION = "Point-to-Point Protocol (PPP) daemon"
HOMEPAGE = "http://samba.org/ppp/"
DEPENDS = "libpcap"
LICENSE = "BSD GPLv2"
-PR = "r2"
+PR = "r3"
SRC_URI = "http://ppp.samba.org/ftp/ppp/ppp-${PV}.tar.gz \
file://makefile.patch;patch=1 \
@@ -28,6 +28,10 @@ inherit autotools
EXTRA_OEMAKE = "STRIPPROG=${STRIP} MANDIR=${D}${datadir}/man/man8 INCDIR=${D}/usr/include LIBDIR=${D}/usr/lib/pppd/${PV} BINDIR=${D}/usr/sbin"
EXTRA_OECONF = "--disable-strip"
+do_stage () {
+ make INCDIR=${STAGING_INCDIR} install-devel
+}
+
do_install_append () {
make install-etcppp ETCDIR=${D}/${sysconfdir}/ppp
mkdir -p ${D}${bindir}/ ${D}${sysconfdir}/init.d