Merge bk://openembedded@openembedded.bkbits.net/packages-devel

into gandalf.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages

2004/11/05 12:13:17+00:00 (none)!cwiiis
Make gpe-conf 0.1.21 build again (reference to non-existent file)

BKrev: 418b9ee8dS688gK5rwNVamW53X4Fmw

diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok
index 35531a9..39b5dc6 100644 (file)
--- a/BitKeeper/etc/logging_ok
+++ b/BitKeeper/etc/logging_ok
@@ -8,6 +8,7 @@ chris@chrislaptop.(none)
 chriz@i74-copy.(none)
 cwiiis@chris.(none)
 cwiiis@chrislaptop.(none)
+cwiiis@cwiiisdesktop.(none)
 dereky@builder.(none)
 emte@t.(none)
 erich@erichl.mine.nu

diff --git a/gpe-conf/gpe-conf_0.1.21.oe b/gpe-conf/gpe-conf_0.1.21.oe
index 62240ef..60c4c36 100644 (file)
--- a/gpe-conf/gpe-conf_0.1.21.oe
+++ b/gpe-conf/gpe-conf_0.1.21.oe
@@ -15,9 +15,10 @@ SRC_URI = "${GPE_MIRROR}/gpe-conf-${PV}.tar.gz \
 # disable wifi support, enable limited capabilities appmgr interface
 CPPFLAGS_append = " -D APPMGR_INTERFACE -DDISABLE_XRANDR -DIMG_HEIGHT=200 -DIMG_WIDTH=200"
 
-do_configure_prepend () {
-       install ${WORKDIR}/netbook.png ${S}/pixmaps/
-}
+# Should this file have been put in OE?
+#do_configure_prepend () {
+#      install ${WORKDIR}/netbook.png ${S}/pixmaps/
+#}
 
 do_compile () {
        oe_runmake PREFIX=${prefix}