Merge openembedded@openembedded.bkbits.net:packages

into flotta.cambridgebroadband.com:/development/openembedded/packages

2004/10/20 11:16:50+01:00 cambridgebroadband.com!rjt
stop sudo's build process from stripping the binarys with the wrong tools.

2004/10/19 15:02:08+01:00 cambridgebroadband.com!rjt
merging

2004/10/14 17:43:25+01:00 cambridgebroadband.com!rjt
Merge bk://openembedded.bkbits.net/packages
into bob.cambridgebroadband.com:/development/openembedded/packages

2004/10/14 17:40:04+01:00 cambridgebroadband.com!rjt
made gdb-cross 6.2.1

2004/10/14 17:39:24+01:00 cambridgebroadband.com!rjt
fixed sudo packaging

2004/10/14 17:38:04+01:00 cambridgebroadband.com!rjt
fixed broken python depends

2004/10/11 10:27:14+01:00 cambridgebroadband.com!rjt
Merge bk://openembedded.bkbits.net/packages
into bob.cambridgebroadband.com:/development/openembedded/packages

2004/10/08 15:04:45+01:00 cambridgebroadband.com!rjt
Packaged linux-atm

2004/10/08 15:04:14+01:00 cambridgebroadband.com!rjt
fix to make binutils build on older architectures

2004/10/05 12:19:29+01:00 cambridgebroadband.com!rjt
Merge bk://openembedded.bkbits.net/packages
into bob.cambridgebroadband.com:/development/openembedded/packages

2004/09/27 10:04:38+01:00 cambridgebroadband.com!rjt
Merge bk://openembedded.bkbits.net/packages
into bob.cambridgebroadband.com:/scratch/rjt/openembedded/packages

2004/09/27 09:50:41+01:00 cambridgebroadband.com!rjt
package glib-1.2

2004/09/27 09:50:01+01:00 cambridgebroadband.com!rjt
package pygtk-0

2004/09/27 09:48:13+01:00 cambridgebroadband.com!rjt
make gtk+-1.2 work

2004/09/24 12:35:15+01:00 cambridgebroadband.com!rjt
fixed for base-files for machines with older stat

2004/09/20 15:54:47+01:00 cambridgebroadband.com!rjt
glib 1.2 and gtk1.2 now compiling and installing

2004/09/20 15:53:51+01:00 cambridgebroadband.com!rjt
changes necessary to compile oe on redhat 7.3

BKrev: 41763b29b_uWtT41rwoUXMMy0uIz5Q

diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok
index 8689a03..d1d7890 100644 (file)
--- a/BitKeeper/etc/logging_ok
+++ b/BitKeeper/etc/logging_ok
@@ -64,6 +64,8 @@ phillim@linux.local
 ral@alwin.at.home
 red@quarm.(none)
 reenoo@sugarcube.dyndns.org
+rjt@bob.cambridgebroadband.com
+rjt@flotta.cambridgebroadband.com
 roy@rant-central.com
 rwhitby@home.(none)
 schurig@mnz66.mn-logistik.de

diff --git a/base-files/base-files_3.0.14.oe b/base-files/base-files_3.0.14.oe
index 6f81eea..7c31a00 100644 (file)
--- a/base-files/base-files_3.0.14.oe
+++ b/base-files/base-files_3.0.14.oe
@@ -95,9 +95,8 @@ do_install () {
         install -d ${D}/etc/init.d ${D}/etc/rcS.d
 
        for d in `(cd ${D}/var; ls)`; do
-               mode=`stat -c %a ${D}/var/$d`
-               echo "mkdir -p /var/$d" >> ${D}/etc/init.d/populate-var.sh
-               echo "chmod $mode /var/$d" >> ${D}/etc/init.d/populate-var.sh
+               echo "mkdir -p /var/$d" >> ${D}/etc/init.d/populate-var
+               echo "chmod --reference=${D}/var/$d /var/$d" >> ${D}/etc/init.d/populate-var.sh
        done
        
        echo "mkdir -p /var/lock/subsys"                >> ${D}/etc/init.d/populate-var.sh

diff --git a/binutils/binutils_2.15.91.0.2.oe b/binutils/binutils_2.15.91.0.2.oe
index ad570de..2dceb19 100644 (file)
--- a/binutils/binutils_2.15.91.0.2.oe
+++ b/binutils/binutils_2.15.91.0.2.oe
@@ -76,6 +76,8 @@ export CC_FOR_HOST = "${CCACHE} ${HOST_PREFIX}gcc"
 export CXX_FOR_HOST = "${CCACHE} ${HOST_PREFIX}gcc"
 
 export CC_FOR_BUILD = "${BUILD_CC}"
+export CPP_FOR_BUILD = "${BUILD_CPP}"
+export CFLAGS_FOR_BUILD = "${BUILD_CFLAGS}"
 
 export CC = "${CCACHE} ${HOST_PREFIX}gcc"
 

diff --git a/gdb/gdb-cross_6.2.1.oe b/gdb/gdb-cross_6.2.1.oe
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/glib-1.2/glib-1.2-1.2.10/depcomp b/glib-1.2/glib-1.2-1.2.10/depcomp
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/glib-1.2/glib-1.2-1.2.10/gcc-3.4-pretty_function b/glib-1.2/glib-1.2-1.2.10/gcc-3.4-pretty_function
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/glib-1.2/glib-1.2-1.2.10/glib-config-use-pkg-config b/glib-1.2/glib-1.2-1.2.10/glib-config-use-pkg-config
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/glib-1.2/glib-1.2-1.2.10/glib-reconf-fix b/glib-1.2/glib-1.2-1.2.10/glib-reconf-fix
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/glib-1.2/glib-1.2-1.2.10/glib.m4-use-pkgconfig b/glib-1.2/glib-1.2-1.2.10/glib.m4-use-pkgconfig
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/glib-1.2/glib-1.2-1.2.10/glibconfig-sysdefs.h b/glib-1.2/glib-1.2-1.2.10/glibconfig-sysdefs.h
new file mode 100644 (file)
index 0000000..1329e7f
--- /dev/null
+++ b/glib-1.2/glib-1.2-1.2.10/glibconfig-sysdefs.h
@@ -0,0 +1,6 @@
+#define GLIB_SYSDEF_POLLIN =1
+#define GLIB_SYSDEF_POLLOUT =4
+#define GLIB_SYSDEF_POLLPRI =2
+#define GLIB_SYSDEF_POLLERR =8
+#define GLIB_SYSDEF_POLLHUP =16
+#define GLIB_SYSDEF_POLLNVAL =32

diff --git a/glib-1.2/glib-1.2-1.2.10/posix-conf-changes b/glib-1.2/glib-1.2-1.2.10/posix-conf-changes
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/glib-1.2/glib-1.2-native_1.2.10.oe b/glib-1.2/glib-1.2-native_1.2.10.oe
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/glib-1.2/glib-1.2_1.2.10.oe b/glib-1.2/glib-1.2_1.2.10.oe
new file mode 100644 (file)
index 0000000..ba4b380
--- /dev/null
+++ b/glib-1.2/glib-1.2_1.2.10.oe
@@ -0,0 +1,46 @@
+PR = "r1"
+DESCRIPTION = "GLib 1.2 is a deprecated libray to \
+provide support for old glib 1.2 based applications"
+SECTION = "libs"
+PRIORITY = "optional"
+MAINTAINER = "Philip Blundell <pb@handhelds.org>"
+DEPENDS = "glib-1.2-native"
+
+LEAD_SONAME = "libglib-1.2.*"
+
+FILESDIR = "${@os.path.dirname(oe.data.getVar('FILE',d,1))}/glib-1.2-${PV}"
+
+EXTRA_OECONF = "--disable-debug"
+
+SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v1.2/glib-${PV}.tar.gz \
+           file://glibconfig-sysdefs.h \
+          file://depcomp \
+          file://glib-reconf-fix;patch=1 \
+           file://posix-conf-changes;patch=1 \
+           file://glib-config-use-pkg-config;patch=1 \
+          file://gcc-3.4-pretty_function;patch=1"
+
+S = "${WORKDIR}/glib-${PV}"
+
+inherit autotools pkgconfig 
+
+acpaths = ""
+do_configure_prepend () {
+       install -m 0644 ${WORKDIR}/glibconfig-sysdefs.h .
+       install -m 0644 ${WORKDIR}/depcomp .
+       rm -f ltconfig acinclude.m4 libtool ltmain.sh
+}
+
+
+do_stage () {
+       oe_libinstall -so libglib ${STAGING_LIBDIR}
+       oe_libinstall -so -C gmodule libgmodule ${STAGING_LIBDIR}
+       oe_libinstall -so -C gthread libgthread ${STAGING_LIBDIR}
+       autotools_stage_includes
+       install -d ${STAGING_INCDIR}/glib-1.2
+       install -m 0644 ${S}/glibconfig.h ${STAGING_INCDIR}/glib-1.2/glibconfig.h
+       install -d ${STAGING_DATADIR}/aclocal
+       install -m 0644 ${S}/glib.m4 ${STAGING_DATADIR}/aclocal/glib-1.2.m4
+       install -m 0755 ${S}/glib-config ${STAGING_BINDIR}
+}
+

diff --git a/gtk+/gtk+-1.2-1.2.10/gtk+1.2-reconf-fix b/gtk+/gtk+-1.2-1.2.10/gtk+1.2-reconf-fix
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/gtk+/gtk+-1.2-1.2.10/no-xwc b/gtk+/gtk+-1.2-1.2.10/no-xwc
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/gtk+/gtk+-1.2_1.2.10.oe b/gtk+/gtk+-1.2_1.2.10.oe
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/gtk+/gtk+-native-1.2_1.2.10.oe b/gtk+/gtk+-native-1.2_1.2.10.oe
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/linux-atm/linux-atm-2.4.1/gcc-3.4-fix b/linux-atm/linux-atm-2.4.1/gcc-3.4-fix
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/linux-atm/linux-atm-2.4.1/qgen-cross b/linux-atm/linux-atm-2.4.1/qgen-cross
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/linux-atm/linux-atm_2.4.1.oe b/linux-atm/linux-atm_2.4.1.oe
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/python/python-pygtk-0.6.12/remove-imlib-et-al b/python/python-pygtk-0.6.12/remove-imlib-et-al
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/python/python-pygtk-0_0.6.12.oe b/python/python-pygtk-0_0.6.12.oe
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/sudo/sudo-1.6.7p5/nostrip.patch b/sudo/sudo-1.6.7p5/nostrip.patch
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/sudo/sudo_1.6.7p5.oe b/sudo/sudo_1.6.7p5.oe
index 0486668..fda03ab 100644 (file)
--- a/sudo/sudo_1.6.7p5.oe
+++ b/sudo/sudo_1.6.7p5.oe
@@ -4,9 +4,12 @@ administrator to give certain users (or groups of \
 users) the ability to run some (or all) commands \
 as root while logging all commands and arguments."
 
+PR="r2"
+
 SRC_URI = "ftp://ftp.sudo.ws/pub/sudo/sudo-${PV}.tar.gz \
           file://nonrootinstall.patch;patch=1 \
-          file://configure.patch;patch=1"
+          file://configure.patch;patch=1 \
+           file://nostrip.patch;patch=1"
 
 inherit autotools
 

diff --git a/xt/xt_0.1.5.oe b/xt/xt_0.1.5.oe
index 97c1e1f..0998c38 100644 (file)
--- a/xt/xt_0.1.5.oe
+++ b/xt/xt_0.1.5.oe
@@ -9,6 +9,16 @@ S = "${WORKDIR}/libXt-${PV}"
 
 inherit autotools pkgconfig 
 
+#nasty hack as utils need to be native
+do_compile() {
+        (
+                unset CC LD CXX CCLD
+#               unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS
+                oe_runmake -C util 'CFLAGS=' 'LDFLAGS=' 'CXXFLAGS=' 'CPPFLAGS=' makestrs
+        )
+        oe_runmake
+}
+
 do_stage () {
        oe_runmake install DESTDIR="" bindir=${STAGING_BINDIR} includedir=${STAGING_INCDIR} libdir=${STAGING_LIBDIR} prefix=${STAGING_DIR}
 }