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

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

2005/02/09 11:03:29+00:00 cambridgebroadband.com!rjt
changed sudo to fetch source by http

2005/02/09 11:02:52+00:00 cambridgebroadband.com!rjt
new upstream version of rxvt-unicode

2005/02/09 11:02:01+00:00 cambridgebroadband.com!rjt
upped CVSDATE of OpenZaurus 3.5.3

2005/02/09 11:00:46+00:00 cambridgebroadband.com!rjt
fixed ipkg for compilation on older gccs

BKrev: 4209ee7ffzh_w25mnGnThzE40wYOeQ

diff --git a/conf/distro/openzaurus-3.5.3.conf b/conf/distro/openzaurus-3.5.3.conf
index 8a3d1f5..a940383 100644 (file)
--- a/conf/distro/openzaurus-3.5.3.conf
+++ b/conf/distro/openzaurus-3.5.3.conf
@@ -13,7 +13,7 @@ FEED_URIS += " \
        console##http://openzaurus.org/official/unstable/3.5.2/feed/console     \
        devel##http://openzaurus.org/official/unstable/3.5.2/feed/devel"
 
-CVSDATE = "20050202"
+CVSDATE = "20050208"
 ASSUME_PROVIDED = "virtual/arm-linux-gcc-2.95"
 PREFERRED_PROVIDERS = "virtual/qte:qte-for-opie virtual/libqpe:libqpe-opie"
 PREFERRED_PROVIDERS += " virtual/xserver:xserver-kdrive"
@@ -62,7 +62,7 @@ PREFERRED_VERSION_gpe-icons = "0.24"
 PREFERRED_VERSION_libgsm = "1.0.10"
 PREFERRED_VERSION_diet-x11 = "6.2.1"
 PREFERRED_VERSION_xcursor-transparent-theme = "0.1.1"
-PREFERRED_VERSION_rxvt-unicode = "3.7"
+PREFERRED_VERSION_rxvt-unicode = "4.9"
 PREFERRED_VERSION_gtk2-theme-angelistic = "0.3"
 CVSDATE_xext = "20041120"
 PREFERRED_VERSION_xst = "0.14"

diff --git a/packages/ipkg/ipkg-0.99.140/remove-c99isms.patch b/packages/ipkg/ipkg-0.99.140/remove-c99isms.patch
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/packages/ipkg/ipkg_0.99.140.bb b/packages/ipkg/ipkg_0.99.140.bb
index e69de29..aae1780 100644 (file)
--- a/packages/ipkg/ipkg_0.99.140.bb
+++ b/packages/ipkg/ipkg_0.99.140.bb
@@ -0,0 +1,53 @@
+SECTION = "base"
+DESCRIPTION = "Itsy Package Manager"
+DESCRIPTION_libipkg = "Itsy Package Manager Library"
+LICENSE = "GPL"
+PROVIDES = "virtual/ipkg libipkg"
+PR = "r0"
+
+PACKAGES =+ "libipkg-dev libipkg"
+FILES_libipkg-dev = "${libdir}/*.a ${libdir}/*.la ${libdir}/*.so"
+FILES_libipkg = "${libdir}"
+AUTO_LIBNAME_PKGS = "libipkg"
+
+SRC_URI = "${HANDHELDS_CVS};module=familiar/dist/ipkg;tag=${@'V' + bb.data.getVar('PV',d,1).replace('.', '-')} \
+       file://terse.patch;patch=1 \
+       file://remove-c99isms.patch;patch=1"
+
+S = "${WORKDIR}/ipkg/C"
+
+inherit autotools pkgconfig
+
+pkg_postinst_ipkg () {
+#!/bin/sh
+if [ "x$D" != "x" ]; then
+       install -d ${IMAGE_ROOTFS}/${sysconfdir}/rcS.d
+       # this happens at S98 where our good 'ole packages script used to run
+       echo -e "#!/bin/sh
+ipkg-cl configure
+" > ${IMAGE_ROOTFS}/${sysconfdir}/rcS.d/S98configure
+       chmod 0755 ${IMAGE_ROOTFS}/${sysconfdir}/rcS.d/S98configure
+fi
+
+update-alternatives --install /usr/bin/ipkg ipkg /usr/bin/ipkg-cl 100
+}
+
+pkg_postrm_ipkg () {
+#!/bin/sh
+update-alternatives --remove ipkg /usr/bin/ipkg-cl
+}
+
+do_stage() {
+       oe_libinstall -so libipkg ${STAGING_LIBDIR}
+       install -d ${STAGING_INCDIR}/replace/
+       install -m 0644 replace/replace.h ${STAGING_INCDIR}/replace/
+       install -d ${STAGING_INCDIR}/libipkg/
+       for f in *.h
+       do
+               install -m 0644 $f ${STAGING_INCDIR}/libipkg/
+       done
+}
+
+#
+# FIXME: Install /etc/ipkg.conf and /etc/ipkg/arch.conf
+#

diff --git a/packages/sudo/sudo_1.6.8p6.bb b/packages/sudo/sudo_1.6.8p6.bb
index e69de29..f9d5541 100644 (file)
--- a/packages/sudo/sudo_1.6.8p6.bb
+++ b/packages/sudo/sudo_1.6.8p6.bb
@@ -0,0 +1,7 @@
+SRC_URI = "http://ftp.sudo.ws/sudo/dist/sudo-${PV}.tar.gz \
+          file://nonrootinstall.patch;patch=1 \
+           file://nostrip.patch;patch=1 \
+          file://autofoo.patch;patch=1 \
+          file://noexec-link.patch;patch=1"
+
+include sudo.inc