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

into workhouse.nexus.co.uk:/home/pb/oe/oe-packages

2004/07/28 00:25:57+02:00 uni-frankfurt.de!mickey
Merge bk://openembedded@openembedded.bkbits.net/packages
into r2d2.tm.informatik.uni-frankfurt.de:/home/projekte/packages

2004/07/28 00:25:48+02:00 uni-frankfurt.de!mickey
install more twin-headers into staging and fix twutils build

2004/07/27 23:36:33+02:00 uni-frankfurt.de!mickey
Merge bk://openembedded@openembedded.bkbits.net/packages
into r2d2.tm.informatik.uni-frankfurt.de:/home/projekte/packages

2004/07/27 19:14:19+02:00 uni-frankfurt.de!mickey
Merge bk://openembedded@openembedded.bkbits.net/packages
into r2d2.tm.informatik.uni-frankfurt.de:/home/projekte/packages

2004/07/27 14:39:09+02:00 uni-frankfurt.de!mickey
Merge bk://openembedded@openembedded.bkbits.net/packages
into r2d2.tm.informatik.uni-frankfurt.de:/home/projekte/packages

2004/07/27 01:26:16+02:00 uni-frankfurt.de!mickey
move fbi into nonworking until we find out how to disable curl and lirc dependencies with this odd buildsystem

2004/07/27 00:37:50+02:00 uni-frankfurt.de!mickey
add description to x86-uml and start with a native machine .conf

BKrev: 4106d7adAlvZr-woyMJcsbfTAE_yoA

diff --git a/conf/native.conf b/conf/native.conf
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/conf/x86-uml.conf b/conf/x86-uml.conf
index e69de29..2dbb605 100644 (file)
--- a/conf/x86-uml.conf
+++ b/conf/x86-uml.conf
@@ -0,0 +1,9 @@
+#@TYPE: Machine
+#@NAME: X86 User Mode Linux
+#@DESCRIPTION: Machine configuration for a User Mode Linux running on an x86 compatible PC
+
+TARGET_ARCH = "i386"
+IPKG_ARCHS = "all i686 i386 x86 x86-uml"
+PREFERRED_PROVIDER_virtual/kernel = "linux-uml"
+BOOTSTRAP_EXTRA_DEPENDS = "virtual/kernel"
+BOOTSTRAP_EXTRA_RDEPENDS = "kernel kernel-modules"

diff --git a/fbi/fbi_1.31.oe b/fbi/fbi_1.31.oe
deleted file mode 100644 (file)
index 814054c..0000000
--- a/fbi/fbi_1.31.oe
+++ /dev/null
@@ -1,10 +0,0 @@
-HOMEPAGE = "http://bytesex.org/fbi.html"
-DESCRIPTION = "frame buffer image viewer"
-DEPENDS = "jpeg"
-
-SRC_URI = "http://dl.bytesex.org/releases/fbida/fbi_${PV}.tar.gz"
-
-inherit autotools
-
-CFLAGS_append = " ${LDFLAGS}"
-EXTRA_OECONF = "--disable-magick --without-x"

diff --git a/nonworking/fbi/fbi_1.31.oe b/nonworking/fbi/fbi_1.31.oe
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/twin/twin_0.4.6.oe b/twin/twin_0.4.6.oe
index 4ca0f80..9d66181 100644 (file)
--- a/twin/twin_0.4.6.oe
+++ b/twin/twin_0.4.6.oe
@@ -13,18 +13,8 @@ do_compile () {
        oe_runmake 'HOSTCC=${BUILD_CC}'
 }
 
-Tw_headers = "Tw1.h Twautoconf.h Twavl.h Tw_defs.h Twerrno.h Tw.h Tw++.h Twkeys.h Twstat_defs.h Twstat.h Twtypes.h"
-
-
 do_stage () {
-#      oe_libinstall -so -C libs/libTw libTw ${STAGING_LIBDIR}
-
-       install -m 0644 ${S}/libs/libTw/libTw.la ${STAGING_LIBDIR}
-       install -m 0644 ${S}/libs/libTw/libTw.so ${STAGING_LIBDIR}
-       install -m 0644 ${S}/libs/libTw/libTw.so.3 ${STAGING_LIBDIR}
-       install -m 0644 ${S}/libs/libTw/libTw.so.3.0.9 ${STAGING_LIBDIR}
+       oe_soinstall libs/libTw/libTw.so.3.0.9 ${STAGING_LIBDIR}
        install -d ${STAGING_INCDIR}/Tw
-       for i in ${Tw_headers}; do
-               install -m 0644 ${S}/include/Tw/$i ${STAGING_INCDIR}/Tw
-       done
+       install -m 0644 include/Tw/*.h ${STAGING_INCDIR}/Tw/
 }

diff --git a/twin/twutils_0.2.oe b/twin/twutils_0.2.oe
index d9a7b25..45c2cff 100644 (file)
--- a/twin/twutils_0.2.oe
+++ b/twin/twutils_0.2.oe
@@ -4,7 +4,14 @@ DEPENDS = "twin"
 
 SRC_URI = "http://linuz.sns.it/~max/twin/twutils-0.2.tar.gz"
 
-#EXTRA_OECONF = ""
-
 inherit autotools
 
+CXXFLAGS_append = " -DHAVE_FUNC_ISINF"
+LDFLAGS_append = " -L${STAGING_LIBDIR}"
+
+do_compile() {
+       for i in admin twkalc
+       do
+               cd ${S}/$i && oe_runmake LDFLAGS="${LDFLAGS}"
+       done
+}