don't remove the ipkg reconfigure script after running. kill off a few obsoleted ipkg versions

BKrev: 4150a6d9BMnDsJKpRbWry35tvhVccg

12 files changed, 2 insertions, 228 deletions

diff --git a/ipkg/ipkg-0.99.121/varargs.patch b/ipkg/ipkg-0.99.121/varargs.patch
deleted file mode 100644
index cca6b2745d..0000000000
--- a/ipkg/ipkg-0.99.121/varargs.patch
+++ /dev/null
@@ -1,72 +0,0 @@
---- C.old/sprintf_alloc.c	2004-01-13 15:51:48.000000000 -0700
-+++ C/sprintf_alloc.c	2004-05-20 16:47:25.240772176 -0700
-@@ -20,12 +20,12 @@
- 
- #include "sprintf_alloc.h"
- 
--static int vsprintf_alloc(char **str, const char *fmt, va_list ap);
--
- int sprintf_alloc(char **str, const char *fmt, ...)
- {
-     int ret;
-     va_list ap;
-+    char *new_str;
-+    int n, size = 100;
- 
-     if (!str) {
-       fprintf(stderr, "Null string pointer passed to sprintf_alloc\n");
-@@ -35,29 +35,27 @@
-       fprintf(stderr, "Null fmt string passed to sprintf_alloc\n");
-       return -1;
-     }
--    va_start(ap, fmt);
--    ret = vsprintf_alloc(str, fmt, ap);
--    va_end(ap);
- 
--    return ret;
--}
-+    /* On x86_64 systems, any strings over 100 were segfaulting.  
-+       It seems that the ap needs to be reinitalized before every
-+       use of the v*printf() functions. I pulled the functionality out
-+       of vsprintf_alloc and combined it all here instead. 
-+    */
-+    
-+
-+    /* ripped more or less straight out of PRINTF(3) */
-+
-+    if ((new_str = malloc(size)) == NULL) 
-+      return -1;
- 
--/* ripped more or less straight out of PRINTF(3) */
--static int vsprintf_alloc(char **str, const char *fmt, va_list ap)
--{
--    char *new_str;
--    /* Guess we need no more than 100 bytes. */
--    int n, size = 100;
-- 
--    if ((new_str = malloc (size)) == NULL)
--	return -1;
-     *str = new_str;
--    while (1) {
--	/* Try to print in the allocated space. */
--	n = vsnprintf (new_str, size, fmt, ap);
--	/* If that worked, return the size. */
--	if (n > -1 && n < size)
--	    return n;
-+    while(1) {
-+      va_start(ap, fmt);
-+      n = vsnprintf (new_str, size, fmt, ap);
-+      va_end(ap);
-+      /* If that worked, return the size. */
-+      if (n > -1 && n < size)
-+	return n;
- 	/* Else try again with more space. */
- 	if (n > -1)    /* glibc 2.1 */
- 	    size = n+1; /* precisely what is needed */
-@@ -71,4 +69,6 @@
- 	}
- 	*str = new_str;
-     }
-+
-+    return -1; /* Just to be correct - it probably won't get here */
- }
diff --git a/ipkg/ipkg-0.99.124/varargs.patch b/ipkg/ipkg-0.99.124/varargs.patch
deleted file mode 100644
index e69de29bb2..0000000000
--- a/ipkg/ipkg-0.99.124/varargs.patch
+++ /dev/null
diff --git a/ipkg/ipkg-0.99.126/depends.patch b/ipkg/ipkg-0.99.126/depends.patch
deleted file mode 100644
index e69de29bb2..0000000000
--- a/ipkg/ipkg-0.99.126/depends.patch
+++ /dev/null
diff --git a/ipkg/ipkg-0.99.126/uninclude-replace.patch b/ipkg/ipkg-0.99.126/uninclude-replace.patch
deleted file mode 100644
index a3ed2201fd..0000000000
--- a/ipkg/ipkg-0.99.126/uninclude-replace.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- C/includes.h	2003-03-28 19:36:22.000000000 +0000
-+++ C/includes.h	2004-07-28 03:41:11.000000000 +0100
-@@ -48,6 +48,6 @@
- # include <unistd.h>
- #endif
- 
--#include "replace/replace.h"
-+//#include "replace/replace.h"
- 
- #endif
diff --git a/ipkg/ipkg-0.99.126/varargs.patch b/ipkg/ipkg-0.99.126/varargs.patch
deleted file mode 100644
index e69de29bb2..0000000000
--- a/ipkg/ipkg-0.99.126/varargs.patch
+++ /dev/null
diff --git a/ipkg/ipkg-native_0.99.121.oe b/ipkg/ipkg-native_0.99.121.oe
deleted file mode 100644
index 7f3daff942..0000000000
--- a/ipkg/ipkg-native_0.99.121.oe
+++ /dev/null
@@ -1,7 +0,0 @@
-include ipkg_${PV}.oe
-inherit native
-
-DEPENDS = "patcher-native libtool-native automake-native"
-FILESDIR = "${@os.path.dirname(oe.data.getVar('FILE',d,1))}/ipkg-${PV}"
-PROVIDES = ""
-
diff --git a/ipkg/ipkg-native_0.99.124.oe b/ipkg/ipkg-native_0.99.124.oe
deleted file mode 100644
index e69de29bb2..0000000000
--- a/ipkg/ipkg-native_0.99.124.oe
+++ /dev/null
diff --git a/ipkg/ipkg-native_0.99.126.oe b/ipkg/ipkg-native_0.99.126.oe
deleted file mode 100644
index e69de29bb2..0000000000
--- a/ipkg/ipkg-native_0.99.126.oe
+++ /dev/null
diff --git a/ipkg/ipkg_0.99.121.oe b/ipkg/ipkg_0.99.121.oe
deleted file mode 100644
index dee970df41..0000000000
--- a/ipkg/ipkg_0.99.121.oe
+++ /dev/null
@@ -1,43 +0,0 @@
-DESCRIPTION = "Itsy Package Manager"
-DESCRIPTION_libipkg = "Itsy Package Manager Library"
-LICENSE = "GPL"
-PROVIDES = "virtual/ipkg libipkg"
-PR = "r1"
-
-PACKAGES =+ "libipkg-dev libipkg "
-FILES_libipkg-dev = "${libdir}/*.a ${libdir}/*.la ${libdir}/*.so"
-FILES_libipkg = "${libdir}"
-AUTO_LIBNAME_PKGS = "libipkg"
-
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=familiar/dist/ipkg;tag=${@'V' + oe.data.getVar('PV',d,1).replace('.', '-')} \
-	   file://varargs.patch;patch=1"
-S = "${WORKDIR}/ipkg/C"
-
-inherit autotools 
-
-pkg_postinst_ipkg () {
-#!/bin/sh
-if [ "x$D" != "x" ]; then
-	install -d ${IMAGE_ROOTFS}/${sysconfdir}/rcS.d
-	echo -e "#!/bin/sh\nipkg-cl configure\nrm -f \$0" > ${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
-}
diff --git a/ipkg/ipkg_0.99.124.oe b/ipkg/ipkg_0.99.124.oe
deleted file mode 100644
index 8e57a6684f..0000000000
--- a/ipkg/ipkg_0.99.124.oe
+++ /dev/null
@@ -1,44 +0,0 @@
-DESCRIPTION = "Itsy Package Manager"
-DESCRIPTION_libipkg = "Itsy Package Manager Library"
-LICENSE = "GPL"
-PROVIDES = "virtual/ipkg libipkg"
-PR = "r2"
-
-PACKAGES =+ "libipkg-dev libipkg "
-FILES_libipkg-dev = "${libdir}/*.a ${libdir}/*.la ${libdir}/*.so"
-FILES_libipkg = "${libdir}"
-AUTO_LIBNAME_PKGS = "libipkg"
-
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=familiar/dist/ipkg;tag=${@'V' + oe.data.getVar('PV',d,1).replace('.', '-')} \
-	   file://varargs.patch;patch=1"
-S = "${WORKDIR}/ipkg/C"
-
-inherit autotools 
-
-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\nipkg-cl configure\nrm -f \$0" > ${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
-}
diff --git a/ipkg/ipkg_0.99.126.oe b/ipkg/ipkg_0.99.126.oe
deleted file mode 100644
index eb0e78e204..0000000000
--- a/ipkg/ipkg_0.99.126.oe
+++ /dev/null
@@ -1,50 +0,0 @@
-DESCRIPTION = "Itsy Package Manager"
-DESCRIPTION_libipkg = "Itsy Package Manager Library"
-LICENSE = "GPL"
-PROVIDES = "virtual/ipkg libipkg"
-PR = "r3"
-
-PACKAGES =+ "libipkg-dev libipkg "
-FILES_libipkg-dev = "${libdir}/*.a ${libdir}/*.la ${libdir}/*.so"
-FILES_libipkg = "${libdir}"
-AUTO_LIBNAME_PKGS = "libipkg"
-
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=familiar/dist/ipkg;tag=${@'V' + oe.data.getVar('PV',d,1).replace('.', '-')} \
-	file://varargs.patch;patch=1 \
-	file://uninclude-replace.patch;patch=1 \
-	file://depends.patch;patch=1"
-S = "${WORKDIR}/ipkg/C"
-
-inherit autotools 
-
-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\nipkg-cl configure\nrm -f \$0" > ${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/ipkg/ipkg_0.99.129.oe b/ipkg/ipkg_0.99.129.oe
index b3492b3c41..1959c0ce8f 100644
--- a/ipkg/ipkg_0.99.129.oe
+++ b/ipkg/ipkg_0.99.129.oe
@@ -2,7 +2,7 @@ DESCRIPTION = "Itsy Package Manager"
 DESCRIPTION_libipkg = "Itsy Package Manager Library"
 LICENSE = "GPL"
 PROVIDES = "virtual/ipkg libipkg"
-PR = "r3"
+PR = "r4"
 
 PACKAGES =+ "libipkg-dev libipkg"
 FILES_libipkg-dev = "${libdir}/*.a ${libdir}/*.la ${libdir}/*.so"
@@ -21,7 +21,7 @@ pkg_postinst_ipkg () {
 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\nipkg-cl configure\nrm -f \$0" > ${IMAGE_ROOTFS}/${sysconfdir}/rcS.d/S98configure
+	echo -e "#!/bin/sh\nipkg-cl configure\n" > ${IMAGE_ROOTFS}/${sysconfdir}/rcS.d/S98configure
 	chmod 0755 ${IMAGE_ROOTFS}/${sysconfdir}/rcS.d/S98configure
 fi