diff options
Diffstat (limited to 'meta/packages/ipkg/files/enable_debversion.patch')
-rw-r--r-- | meta/packages/ipkg/files/enable_debversion.patch | 111 |
1 files changed, 0 insertions, 111 deletions
diff --git a/meta/packages/ipkg/files/enable_debversion.patch b/meta/packages/ipkg/files/enable_debversion.patch deleted file mode 100644 index e9c3a7a1d..000000000 --- a/meta/packages/ipkg/files/enable_debversion.patch +++ /dev/null @@ -1,111 +0,0 @@ -OE makes heavy use of the revision field so it makes sense to -enable it. We don't want the familiar stuff though so patch that -out. - -RP - 19/02/2008 - -Index: ipkg-0.99.163/pkg.c -=================================================================== ---- ipkg-0.99.163.orig/pkg.c 2008-02-19 00:35:03.000000000 +0000 -+++ ipkg-0.99.163/pkg.c 2008-02-19 00:36:02.000000000 +0000 -@@ -1118,15 +1118,11 @@ - return r; - } - --#ifdef USE_DEBVERSION - r = verrevcmp(pkg->revision, ref_pkg->revision); - if (r) { - return r; - } - -- r = verrevcmp(pkg->familiar_revision, ref_pkg->familiar_revision); --#endif -- - return r; - } - -@@ -1240,10 +1236,7 @@ - { - char *complete_version; - char *epoch_str; --#ifdef USE_DEBVERSION - char *revision_str; -- char *familiar_revision_str; --#endif - - if (pkg->epoch) { - sprintf_alloc(&epoch_str, "%d:", pkg->epoch); -@@ -1251,33 +1244,18 @@ - epoch_str = strdup(""); - } - --#ifdef USE_DEBVERSION - if (pkg->revision && strlen(pkg->revision)) { - sprintf_alloc(&revision_str, "-%s", pkg->revision); - } else { - revision_str = strdup(""); - } - -- if (pkg->familiar_revision && strlen(pkg->familiar_revision)) { -- sprintf_alloc(&familiar_revision_str, "-fam%s", pkg->familiar_revision); -- } else { -- familiar_revision_str = strdup(""); -- } --#endif - --#ifdef USE_DEBVERSION -- sprintf_alloc(&complete_version, "%s%s%s%s", -- epoch_str, pkg->version, revision_str, familiar_revision_str); --#else -- sprintf_alloc(&complete_version, "%s%s", -- epoch_str, pkg->version); --#endif -+ sprintf_alloc(&complete_version, "%s%s%s", -+ epoch_str, pkg->version, revision_str); - - free(epoch_str); --#ifdef USE_DEBVERSION - free(revision_str); -- free(familiar_revision_str); --#endif - - return complete_version; - } -Index: ipkg-0.99.163/pkg_parse.c -=================================================================== ---- ipkg-0.99.163.orig/pkg_parse.c 2008-02-19 00:35:03.000000000 +0000 -+++ ipkg-0.99.163/pkg_parse.c 2008-02-19 00:38:42.000000000 +0000 -@@ -105,9 +105,7 @@ - int parseVersion(pkg_t *pkg, char *raw) - { - char *colon, *eepochcolon; --#ifdef USE_DEBVERSION - char *hyphen; --#endif - unsigned long epoch; - - if (!*raw) { -@@ -149,23 +147,12 @@ - } - strcpy(pkg->version, raw); - --#ifdef USE_DEBVERSION - hyphen= strrchr(pkg->version,'-'); - - if (hyphen) { - *hyphen++= 0; -- if (strncmp("fam", hyphen, 3) == 0) { -- pkg->familiar_revision=hyphen+3; -- hyphen= strrchr(pkg->version,'-'); -- if (hyphen) { -- *hyphen++= 0; -- pkg->revision = hyphen; -- } -- } else { - pkg->revision = hyphen; -- } - } --#endif - - /* - fprintf(stderr,"Parsed version: %lu, %s, %s, %s\n", |