Merge oe-devel@oe-devel.bkbits.net:openembedded

into odin.sc.ti.com:/home/kergoth/code/user/oe/openembedded

2005/02/17 18:13:12-06:00 ti.com!kergoth
Unbork stripping of binaries in wiggle, gkrellm, and hotplug-ng.

BKrev: 42153327Qym-5Fezq2EVfAXjBTUygQ

diff --git a/packages/gkrellm/gkrellm_2.2.1.bb b/packages/gkrellm/gkrellm_2.2.1.bb
index e69de29..2c52cec 100644 (file)
--- a/packages/gkrellm/gkrellm_2.2.1.bb
+++ b/packages/gkrellm/gkrellm_2.2.1.bb
@@ -0,0 +1,26 @@
+SECTION = "x11/utils"
+DESCRIPTION = "GKrellM is a GTK-based stacked monitor program."
+MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
+LICENSE = "GPL"
+DEPENDS = "gtk+ glib-2.0 libsm ice"
+PR = "r1"
+
+SRC_URI = "http://web.wt.net/~billw/gkrellm/gkrellm-${PV}.tar.bz2"
+S = "${WORKDIR}/gkrellm-${PV}"
+
+inherit pkgconfig
+
+EXTRA_OEMAKE = "'glib12=0' 'STRIP=/bin/true'"
+export LINK_FLAGS = "${LDFLAGS}"
+export SMC_LIBS = "-lSM -lICE"
+
+do_install () {
+       oe_runmake 'INSTALLDIR=${D}/${bindir}' \
+                  'SINSTALLDIR=${D}/${bindir}' \
+                  'MANDIR=${D}/${mandir}/man1' \
+                  'SMANDIR=${D}/${mandir}/man1' \
+                  'INCLUDEDIR=${D}/${includedir}' \
+                  'PKGCONFIGDIR=${D}/${libdir}/pkgconfig' \
+                  'LOCALEDIR=${D}/${datadir}/locale' \
+                  install
+}

diff --git a/packages/hotplug-ng/hotplug-ng_001.bb b/packages/hotplug-ng/hotplug-ng_001.bb
index e69de29..f287893 100644 (file)
--- a/packages/hotplug-ng/hotplug-ng_001.bb
+++ b/packages/hotplug-ng/hotplug-ng_001.bb
@@ -0,0 +1,26 @@
+DESCRIPTION = "This collection of code replaces the existing linux-hotplug \
+package with very tiny, compiled executable programs, instead of the \
+existing bash scripts."
+LICENSE = "GPL"
+MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
+RPROVIDES = "hotplug"
+RCONFLICTS = "hotplug"
+RREPLACES = "hotplug"
+PR = "r1"
+
+SRC_URI = "http://www.kernel.org/pub/linux/utils/kernel/hotplug/hotplug-ng-${PV}.tar.gz \
+          file://flags.patch;patch=1"
+S = "${WORKDIR}/hotplug-ng-${PV}"
+
+LD = "${CC}"
+export HOSTCC = "${BUILD_CC}"
+# Stripping should be done when _packaging_, not building
+EXTRA_OEMAKE += "'STRIP=/bin/true'"
+
+export etcdir = "${sysconfdir}"
+export sbindir = "${base_sbindir}"
+export bindir = "${base_bindir}"
+
+do_install () {
+       oe_runmake 'DESTDIR=${D}' install
+}

diff --git a/packages/wiggle/wiggle_0.6.bb b/packages/wiggle/wiggle_0.6.bb
index e69de29..ad45963 100644 (file)
--- a/packages/wiggle/wiggle_0.6.bb
+++ b/packages/wiggle/wiggle_0.6.bb
@@ -0,0 +1,27 @@
+LICENSE = GPL
+DESCRIPTION = "Wiggle is a program for applying patches that patch cannot \
+apply because of conflicting changes."
+MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
+SECTION = "console/utils"
+PR = "r1"
+
+SRC_URI = "http://cgi.cse.unsw.edu.au/~neilb/source/wiggle/wiggle-${PV}.tar.gz \
+          file://001NoQuietTime;patch=1 \
+          file://002SpecFile;patch=1 \
+          file://003Recommit;patch=1 \
+          file://004ExtractFix;patch=1 \
+          file://005Pchanges;patch=1"
+S = "${WORKDIR}/wiggle-${PV}"
+
+export MANDIR = "${mandir}"
+export BINDIR = "${bindir}"
+EXTRA_OEMAKE += "'STRIP=/bin/true'"
+
+do_compile () {
+#      oe_runmake wiggle wiggle.man # requires nroff
+       oe_runmake wiggle
+}
+
+do_install () {
+       oe_runmake 'DESTDIR=${D}' install
+}