summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--meta/packages/ipkg/files/enable_debversion.patch111
-rw-r--r--meta/packages/ipkg/files/fix_tar_extension.patch37
-rw-r--r--meta/packages/ipkg/files/ipkg_bugfix.patch44
-rw-r--r--meta/packages/ipkg/files/noupdalt.patch15
-rw-r--r--meta/packages/ipkg/files/terse.patch18
-rw-r--r--meta/packages/ipkg/files/uclibc.patch13
-rw-r--r--meta/packages/ipkg/files/uninclude-replace.patch10
-rw-r--r--meta/packages/ipkg/files/update_version_comparision.patch84
-rw-r--r--meta/packages/ipkg/ipkg-native.inc12
-rw-r--r--meta/packages/ipkg/ipkg-native_0.99.154.bb4
-rw-r--r--meta/packages/ipkg/ipkg-sdk_0.99.154.bb2
-rw-r--r--meta/packages/ipkg/ipkg.inc60
-rw-r--r--meta/packages/ipkg/ipkg_0.99.154.bb6
13 files changed, 0 insertions, 416 deletions
diff --git a/meta/packages/ipkg/files/enable_debversion.patch b/meta/packages/ipkg/files/enable_debversion.patch
deleted file mode 100644
index e9c3a7a1d4..0000000000
--- a/meta/packages/ipkg/files/enable_debversion.patch
+++ /dev/null
@@ -1,111 +0,0 @@
1OE makes heavy use of the revision field so it makes sense to
2enable it. We don't want the familiar stuff though so patch that
3out.
4
5RP - 19/02/2008
6
7Index: ipkg-0.99.163/pkg.c
8===================================================================
9--- ipkg-0.99.163.orig/pkg.c 2008-02-19 00:35:03.000000000 +0000
10+++ ipkg-0.99.163/pkg.c 2008-02-19 00:36:02.000000000 +0000
11@@ -1118,15 +1118,11 @@
12 return r;
13 }
14
15-#ifdef USE_DEBVERSION
16 r = verrevcmp(pkg->revision, ref_pkg->revision);
17 if (r) {
18 return r;
19 }
20
21- r = verrevcmp(pkg->familiar_revision, ref_pkg->familiar_revision);
22-#endif
23-
24 return r;
25 }
26
27@@ -1240,10 +1236,7 @@
28 {
29 char *complete_version;
30 char *epoch_str;
31-#ifdef USE_DEBVERSION
32 char *revision_str;
33- char *familiar_revision_str;
34-#endif
35
36 if (pkg->epoch) {
37 sprintf_alloc(&epoch_str, "%d:", pkg->epoch);
38@@ -1251,33 +1244,18 @@
39 epoch_str = strdup("");
40 }
41
42-#ifdef USE_DEBVERSION
43 if (pkg->revision && strlen(pkg->revision)) {
44 sprintf_alloc(&revision_str, "-%s", pkg->revision);
45 } else {
46 revision_str = strdup("");
47 }
48
49- if (pkg->familiar_revision && strlen(pkg->familiar_revision)) {
50- sprintf_alloc(&familiar_revision_str, "-fam%s", pkg->familiar_revision);
51- } else {
52- familiar_revision_str = strdup("");
53- }
54-#endif
55
56-#ifdef USE_DEBVERSION
57- sprintf_alloc(&complete_version, "%s%s%s%s",
58- epoch_str, pkg->version, revision_str, familiar_revision_str);
59-#else
60- sprintf_alloc(&complete_version, "%s%s",
61- epoch_str, pkg->version);
62-#endif
63+ sprintf_alloc(&complete_version, "%s%s%s",
64+ epoch_str, pkg->version, revision_str);
65
66 free(epoch_str);
67-#ifdef USE_DEBVERSION
68 free(revision_str);
69- free(familiar_revision_str);
70-#endif
71
72 return complete_version;
73 }
74Index: ipkg-0.99.163/pkg_parse.c
75===================================================================
76--- ipkg-0.99.163.orig/pkg_parse.c 2008-02-19 00:35:03.000000000 +0000
77+++ ipkg-0.99.163/pkg_parse.c 2008-02-19 00:38:42.000000000 +0000
78@@ -105,9 +105,7 @@
79 int parseVersion(pkg_t *pkg, char *raw)
80 {
81 char *colon, *eepochcolon;
82-#ifdef USE_DEBVERSION
83 char *hyphen;
84-#endif
85 unsigned long epoch;
86
87 if (!*raw) {
88@@ -149,23 +147,12 @@
89 }
90 strcpy(pkg->version, raw);
91
92-#ifdef USE_DEBVERSION
93 hyphen= strrchr(pkg->version,'-');
94
95 if (hyphen) {
96 *hyphen++= 0;
97- if (strncmp("fam", hyphen, 3) == 0) {
98- pkg->familiar_revision=hyphen+3;
99- hyphen= strrchr(pkg->version,'-');
100- if (hyphen) {
101- *hyphen++= 0;
102- pkg->revision = hyphen;
103- }
104- } else {
105 pkg->revision = hyphen;
106- }
107 }
108-#endif
109
110 /*
111 fprintf(stderr,"Parsed version: %lu, %s, %s, %s\n",
diff --git a/meta/packages/ipkg/files/fix_tar_extension.patch b/meta/packages/ipkg/files/fix_tar_extension.patch
deleted file mode 100644
index d9db5fca2c..0000000000
--- a/meta/packages/ipkg/files/fix_tar_extension.patch
+++ /dev/null
@@ -1,37 +0,0 @@
1Index: C/libbb/unarchive.c
2===================================================================
3--- C.orig/libbb/unarchive.c 2005-02-05 16:58:19.000000000 -0500
4+++ C/libbb/unarchive.c 2006-08-08 08:10:14.268431408 -0400
5@@ -28,7 +28,7 @@
6 #include "libbb.h"
7
8 #define CONFIG_FEATURE_TAR_OLDGNU_COMPATABILITY 1
9-// #define CONFIG_FEATURE_TAR_GNU_EXTENSIONS
10+#define CONFIG_FEATURE_TAR_GNU_EXTENSIONS 1
11
12 #ifdef CONFIG_FEATURE_TAR_GNU_EXTENSIONS
13 static char *longname = NULL;
14@@ -657,7 +657,10 @@
15 # ifdef CONFIG_FEATURE_TAR_GNU_EXTENSIONS
16 case 'L': {
17 longname = xmalloc(tar_entry->size + 1);
18- archive_xread_all((int) tar_stream, longname, tar_entry->size);
19+ if(fread(longname, tar_entry->size, 1, tar_stream) != 1) {
20+ error_msg("Short read in gnu extension");
21+ return(NULL);
22+ }
23 longname[tar_entry->size] = '\0';
24 archive_offset += tar_entry->size;
25
26@@ -665,7 +668,10 @@
27 }
28 case 'K': {
29 linkname = xmalloc(tar_entry->size + 1);
30- archive_xread_all((int) tar_stream, longname, tar_entry->size);
31+ if(fread(linkname, tar_entry->size, 1, tar_stream) != 1) {
32+ error_msg("Short read in gnu extension");
33+ return(NULL);
34+ }
35 linkname[tar_entry->size] = '\0';
36 archive_offset += tar_entry->size;
37
diff --git a/meta/packages/ipkg/files/ipkg_bugfix.patch b/meta/packages/ipkg/files/ipkg_bugfix.patch
deleted file mode 100644
index 51eccbb2bd..0000000000
--- a/meta/packages/ipkg/files/ipkg_bugfix.patch
+++ /dev/null
@@ -1,44 +0,0 @@
1Index: C/ipkg_conf.c
2===================================================================
3--- C.orig/ipkg_conf.c 2005-06-21 13:59:32.000000000 +0000
4+++ C/ipkg_conf.c 2007-11-27 01:11:17.000000000 +0000
5@@ -423,6 +423,7 @@
6 nv_pair_t *nv_pair;
7 pkg_dest_t *dest;
8 char *root_dir;
9+ char *list_dir2;
10
11 for (iter = nv_pair_list->head; iter; iter = iter->next) {
12 nv_pair = iter->data;
13@@ -432,8 +433,14 @@
14 } else {
15 root_dir = strdup(nv_pair->value);
16 }
17- dest = pkg_dest_list_append(&conf->pkg_dest_list, nv_pair->name, root_dir, lists_dir);
18+ if (conf->offline_root) {
19+ sprintf_alloc(&list_dir2, "%s%s", conf->offline_root, lists_dir);
20+ } else {
21+ list_dir2 = strdup(lists_dir);
22+ }
23+ dest = pkg_dest_list_append(&conf->pkg_dest_list, nv_pair->name, root_dir, list_dir2);
24 free(root_dir);
25+ free(list_dir2);
26 if (dest == NULL) {
27 continue;
28 }
29@@ -562,13 +569,13 @@
30 } else if (strcmp(type, "dest") == 0) {
31 nv_pair_list_append(tmp_dest_nv_pair_list, name, value);
32 } else if (strcmp(type, "lists_dir") == 0) {
33- *lists_dir = realloc(*lists_dir,strlen(value)+1);
34+ *lists_dir = realloc(*lists_dir,strlen(name)+1);
35 if (*lists_dir == NULL) {
36 ipkg_message(conf, IPKG_ERROR, "ERROR: Not enough memory\n");
37 free(options);
38 return EINVAL;
39 }
40- sprintf (*lists_dir,"%s",value);
41+ sprintf (*lists_dir,"%s", name);
42 } else if (strcmp(type, "arch") == 0) {
43 ipkg_message(conf, IPKG_INFO, "supported arch %s priority (%s)\n", name, value);
44 if (!value) {
diff --git a/meta/packages/ipkg/files/noupdalt.patch b/meta/packages/ipkg/files/noupdalt.patch
deleted file mode 100644
index f668e82f6b..0000000000
--- a/meta/packages/ipkg/files/noupdalt.patch
+++ /dev/null
@@ -1,15 +0,0 @@
1---
2 Makefile.am | 2 --
3 1 file changed, 2 deletions(-)
4
5--- C.orig/Makefile.am
6+++ C/Makefile.am
7@@ -10,8 +10,6 @@ bin_PROGRAMS = ipkg-cl
8
9 lib_LTLIBRARIES = libipkg.la
10
11-bin_SCRIPTS = update-alternatives
12-
13 # ipkg_LDADD = libbb/libbb.a replace/libreplace.a
14
15 #ipkg_cl_LDADD = libipkg.la libbb/libbb.la replace/libreplace.a
diff --git a/meta/packages/ipkg/files/terse.patch b/meta/packages/ipkg/files/terse.patch
deleted file mode 100644
index 3c4d6bed7e..0000000000
--- a/meta/packages/ipkg/files/terse.patch
+++ /dev/null
@@ -1,18 +0,0 @@
1
2#
3# Patch managed by http://www.holgerschurig.de/patcher.html
4#
5
6--- C/ipkg_cmd.c~terse
7+++ C/ipkg_cmd.c
8@@ -148,9 +146,7 @@
9 int result;
10 p_userdata = userdata;
11 result = (cmd->fun)(conf, argc, argv);
12- if ( result == 0 ) {
13- ipkg_message(conf, IPKG_NOTICE, "Successfully terminated.\n");
14- } else {
15+ if ( result != 0 ) {
16 ipkg_message(conf, IPKG_NOTICE, "An error ocurred, return value: %d.\n", result);
17 }
18
diff --git a/meta/packages/ipkg/files/uclibc.patch b/meta/packages/ipkg/files/uclibc.patch
deleted file mode 100644
index d0d3a3ff7c..0000000000
--- a/meta/packages/ipkg/files/uclibc.patch
+++ /dev/null
@@ -1,13 +0,0 @@
1Index: C/libbb/libbb.h
2===================================================================
3--- C.orig/libbb/libbb.h 2003-02-24 10:31:52.000000000 -0500
4+++ C/libbb/libbb.h 2005-01-20 03:07:10.031420944 -0500
5@@ -340,7 +340,7 @@
6 #define CONSOLE_DEV "/dev/console"
7
8 /* Cope with mmu-less systems somewhat gracefully */
9-#if defined(__UCLIBC__) && !defined(__UCLIBC_HAS_MMU__)
10+#if defined(__UCLIBC__) && !defined(__ARCH_HAS_MMU__)
11 #define fork vfork
12 #endif
13
diff --git a/meta/packages/ipkg/files/uninclude-replace.patch b/meta/packages/ipkg/files/uninclude-replace.patch
deleted file mode 100644
index a3ed2201fd..0000000000
--- a/meta/packages/ipkg/files/uninclude-replace.patch
+++ /dev/null
@@ -1,10 +0,0 @@
1--- C/includes.h 2003-03-28 19:36:22.000000000 +0000
2+++ C/includes.h 2004-07-28 03:41:11.000000000 +0100
3@@ -48,6 +48,6 @@
4 # include <unistd.h>
5 #endif
6
7-#include "replace/replace.h"
8+//#include "replace/replace.h"
9
10 #endif
diff --git a/meta/packages/ipkg/files/update_version_comparision.patch b/meta/packages/ipkg/files/update_version_comparision.patch
deleted file mode 100644
index b0d0df525b..0000000000
--- a/meta/packages/ipkg/files/update_version_comparision.patch
+++ /dev/null
@@ -1,84 +0,0 @@
1Update the version comparision to a more recent one from dpkg. This
2means it now recognises 0.0-foo > 0.0+foo as it should.
3
4RP - 19/02/2008
5
6Index: ipkg-0.99.163/pkg.c
7===================================================================
8--- ipkg-0.99.163.orig/pkg.c 2008-02-18 11:24:45.000000000 +0000
9+++ ipkg-0.99.163/pkg.c 2008-02-19 00:24:50.000000000 +0000
10@@ -1128,43 +1130,37 @@
11 return r;
12 }
13
14-int verrevcmp(const char *val, const char *ref)
15-{
16- int vc, rc;
17- long vl, rl;
18- const char *vp, *rp;
19- const char *vsep, *rsep;
20-
21- if (!val) val= "";
22- if (!ref) ref= "";
23- for (;;) {
24- vp= val; while (*vp && !isdigit(*vp)) vp++;
25- rp= ref; while (*rp && !isdigit(*rp)) rp++;
26- for (;;) {
27- vc= (val == vp) ? 0 : *val++;
28- rc= (ref == rp) ? 0 : *ref++;
29- if (!rc && !vc) break;
30- if (vc && !isalpha(vc)) vc += 256; /* assumes ASCII character set */
31- if (rc && !isalpha(rc)) rc += 256;
32- if (vc != rc) return vc - rc;
33- }
34- val= vp;
35- ref= rp;
36- vl=0; if (isdigit(*vp)) vl= strtol(val,(char**)&val,10);
37- rl=0; if (isdigit(*rp)) rl= strtol(ref,(char**)&ref,10);
38- if (vl != rl) return vl - rl;
39-
40- vc = *val;
41- rc = *ref;
42- vsep = strchr(".-", vc);
43- rsep = strchr(".-", rc);
44- if (vsep && !rsep) return -1;
45- if (!vsep && rsep) return +1;
46-
47- if (!*val && !*ref) return 0;
48- if (!*val) return -1;
49- if (!*ref) return +1;
50- }
51+/* assume ascii; warning: evaluates x multiple times! */
52+#define order(x) ((x) == '~' ? -1 \
53+ : isdigit((x)) ? 0 \
54+ : !(x) ? 0 \
55+ : isalpha((x)) ? (x) \
56+ : (x) + 256)
57+
58+static int verrevcmp(const char *val, const char *ref) {
59+ if (!val) val= "";
60+ if (!ref) ref= "";
61+
62+ while (*val || *ref) {
63+ int first_diff= 0;
64+
65+ while ( (*val && !isdigit(*val)) || (*ref && !isdigit(*ref)) ) {
66+ int vc= order(*val), rc= order(*ref);
67+ if (vc != rc) return vc - rc;
68+ val++; ref++;
69+ }
70+
71+ while ( *val == '0' ) val++;
72+ while ( *ref == '0' ) ref++;
73+ while (isdigit(*val) && isdigit(*ref)) {
74+ if (!first_diff) first_diff= *val - *ref;
75+ val++; ref++;
76+ }
77+ if (isdigit(*val)) return 1;
78+ if (isdigit(*ref)) return -1;
79+ if (first_diff) return first_diff;
80+ }
81+ return 0;
82 }
83
84 int pkg_version_satisfied(pkg_t *it, pkg_t *ref, const char *op)
diff --git a/meta/packages/ipkg/ipkg-native.inc b/meta/packages/ipkg/ipkg-native.inc
deleted file mode 100644
index 89b1a5fab0..0000000000
--- a/meta/packages/ipkg/ipkg-native.inc
+++ /dev/null
@@ -1,12 +0,0 @@
1# NOTE: ipkg now obeys ${libdir}, so ipkg-native now installs
2# things into the wrong location inside of offline_root. Backup
3# the target libdir and use that.
4target_libdir := "${libdir}"
5
6inherit native
7
8EXTRA_OECONF += "--with-ipkgdir=${target_libdir}/ipkg"
9
10DEPENDS = "libtool-native automake-native virtual/update-alternatives-native"
11FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/ipkg-${PV}"
12PROVIDES = ""
diff --git a/meta/packages/ipkg/ipkg-native_0.99.154.bb b/meta/packages/ipkg/ipkg-native_0.99.154.bb
deleted file mode 100644
index 8435b4de1d..0000000000
--- a/meta/packages/ipkg/ipkg-native_0.99.154.bb
+++ /dev/null
@@ -1,4 +0,0 @@
1require ipkg.inc
2require ipkg-native.inc
3
4PR = "r3"
diff --git a/meta/packages/ipkg/ipkg-sdk_0.99.154.bb b/meta/packages/ipkg/ipkg-sdk_0.99.154.bb
deleted file mode 100644
index b49fc93b50..0000000000
--- a/meta/packages/ipkg/ipkg-sdk_0.99.154.bb
+++ /dev/null
@@ -1,2 +0,0 @@
1require ipkg.inc
2inherit sdk
diff --git a/meta/packages/ipkg/ipkg.inc b/meta/packages/ipkg/ipkg.inc
deleted file mode 100644
index e1c544057e..0000000000
--- a/meta/packages/ipkg/ipkg.inc
+++ /dev/null
@@ -1,60 +0,0 @@
1DESCRIPTION = "Itsy Package Manager"
2DESCRIPTION_libipkg = "Itsy Package Manager Library"
3SECTION = "base"
4LICENSE = "GPL"
5PROVIDES = "virtual/ipkg libipkg"
6
7FILES_libipkg-dev = "${libdir}/*.a ${libdir}/*.la ${libdir}/*.so ${includedir}"
8FILES_libipkg = "${libdir}/*.so.*"
9AUTO_LIBNAME_PKGS = "libipkg"
10
11SRC_URI = "${HANDHELDS_CVS};module=familiar/dist/ipkg;tag=${@'V' + bb.data.getVar('PV',d,1).replace('.', '-')} \
12 file://fix_tar_extension.patch;patch=1 \
13 file://update_version_comparision.patch;patch=1 \
14 file://enable_debversion.patch;patch=1 \
15 file://terse.patch;patch=1 \
16 file://ipkg_bugfix.patch;patch=1 \
17 file://noupdalt.patch;patch=1"
18
19S = "${WORKDIR}/ipkg/C"
20
21inherit autotools pkgconfig
22
23# Define a variable to allow distros to run configure earlier.
24# (for example, to enable loading of ethernet kernel modules before networking starts)
25IPKG_INIT_POSITION = "98"
26IPKG_INIT_POSITION_slugos = "41"
27
28pkg_postinst_ipkg () {
29#!/bin/sh
30if [ "x$D" != "x" ]; then
31 install -d ${IMAGE_ROOTFS}/${sysconfdir}/rcS.d
32 # this happens at S98 where our good 'ole packages script used to run
33 echo "#!/bin/sh
34ipkg-cl configure
35" > ${IMAGE_ROOTFS}/${sysconfdir}/rcS.d/S${IPKG_INIT_POSITION}configure
36 chmod 0755 ${IMAGE_ROOTFS}/${sysconfdir}/rcS.d/S${IPKG_INIT_POSITION}configure
37fi
38
39update-alternatives --install ${bindir}/ipkg ipkg ${bindir}/ipkg-cl 100
40}
41
42pkg_postrm_ipkg () {
43#!/bin/sh
44update-alternatives --remove ipkg ${bindir}/ipkg-cl
45}
46
47do_stage() {
48 oe_libinstall -so libipkg ${STAGING_LIBDIR}
49 install -d ${STAGING_INCDIR}/replace/
50 install -m 0644 replace/replace.h ${STAGING_INCDIR}/replace/
51 install -d ${STAGING_INCDIR}/libipkg/
52 for f in *.h
53 do
54 install -m 0644 $f ${STAGING_INCDIR}/libipkg/
55 done
56}
57
58#
59# FIXME: Install /etc/ipkg.conf and /etc/ipkg/arch.conf
60#
diff --git a/meta/packages/ipkg/ipkg_0.99.154.bb b/meta/packages/ipkg/ipkg_0.99.154.bb
deleted file mode 100644
index 83773a5058..0000000000
--- a/meta/packages/ipkg/ipkg_0.99.154.bb
+++ /dev/null
@@ -1,6 +0,0 @@
1require ipkg.inc
2PR = "r10"
3
4PACKAGES =+ "libipkg-dev libipkg"
5
6RDEPENDS_${PN} += "${VIRTUAL-RUNTIME_update-alternatives}"
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2026-01-24 16:49:23 +0000