diff options
| author | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2007-10-18 16:35:01 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2007-10-18 16:35:01 +0000 |
| commit | 2b94d96062ac7eb6a15445f74e424b7b08e69a63 (patch) | |
| tree | a4ceb58e4985908f2dd574d498e1e17f38061f5e /packages/ipkg | |
| parent | 51d88fa521229df09a9d624618d7e861d765d21a (diff) | |
| parent | 0ed630ee92d26828b61f1de72dc0b33d2a056123 (diff) | |
merge of '1d0e13e8c6528e7a7037276e3c01cb21dfa085e4'
and '86581f7de9bc72fe5e21778b4442cc0e59e96fbf'
Diffstat (limited to 'packages/ipkg')
| -rw-r--r-- | packages/ipkg/files/lonk-link-name.patch | 38 | ||||
| -rw-r--r-- | packages/ipkg/ipkg-collateral.bb | 1 | ||||
| -rw-r--r-- | packages/ipkg/ipkg_0.99.163.bb | 3 |
3 files changed, 40 insertions, 2 deletions
diff --git a/packages/ipkg/files/lonk-link-name.patch b/packages/ipkg/files/lonk-link-name.patch new file mode 100644 index 0000000000..14fc73a5ac --- /dev/null +++ b/packages/ipkg/files/lonk-link-name.patch @@ -0,0 +1,38 @@ +--- ipkg-0.99.163/libbb/unarchive.c.orig 2007-10-04 12:39:42.000000000 +0200 ++++ ipkg-0.99.163/libbb/unarchive.c 2007-10-04 12:41:28.000000000 +0200 +@@ -595,10 +595,6 @@ + if (longname) { + tar_entry->name = longname; + longname = NULL; +- } +- else if (linkname) { +- tar_entry->name = linkname; +- linkname = NULL; + } else + #endif + if (tar.formated.prefix[0] == 0) { +@@ -606,6 +602,15 @@ + } else { + tar_entry->name = concat_path_file(tar.formated.prefix, tar.formated.name); + } ++ ++#ifdef CONFIG_FEATURE_TAR_GNU_EXTENSIONS ++ if (linkname) { ++ tar_entry->link_name = linkname; ++ linkname = NULL; ++ } else ++#endif ++ tar_entry->link_name = strlen(tar.formated.linkname) ? ++ xstrdup(tar.formated.linkname) : NULL; + + // tar_entry->name = xstrdup(tar.formated.name); + +@@ -618,8 +623,6 @@ + tar_entry->gid = strtol(tar.formated.gid, NULL, 8); + tar_entry->size = strtol(tar.formated.size, NULL, 8); + tar_entry->mtime = strtol(tar.formated.mtime, NULL, 8); +- tar_entry->link_name = strlen(tar.formated.linkname) ? +- xstrdup(tar.formated.linkname) : NULL; + tar_entry->device = (strtol(tar.formated.devmajor, NULL, 8) << 8) + + strtol(tar.formated.devminor, NULL, 8); + diff --git a/packages/ipkg/ipkg-collateral.bb b/packages/ipkg/ipkg-collateral.bb index 244d29d08a..3fd55507e2 100644 --- a/packages/ipkg/ipkg-collateral.bb +++ b/packages/ipkg/ipkg-collateral.bb @@ -2,7 +2,6 @@ DESCRIPTION = "ipkg configuration files" SECTION = "base" LICENSE = "MIT" PR = "r7" -PACKAGE_ARCH = "${MACHINE_ARCH}" SRC_URI = " \ file://ipkg.conf.comments \ diff --git a/packages/ipkg/ipkg_0.99.163.bb b/packages/ipkg/ipkg_0.99.163.bb index c5972a7c53..56e25900c1 100644 --- a/packages/ipkg/ipkg_0.99.163.bb +++ b/packages/ipkg/ipkg_0.99.163.bb @@ -1,5 +1,5 @@ include ipkg.inc -PR = "r4" +PR = "r5" S = "${WORKDIR}/ipkg-${PV}" @@ -8,6 +8,7 @@ SRC_URI = "http://www.handhelds.org/pub/packages/ipkg/ipkg-${PV}.tar.gz \ file://is-processing.patch;patch=1 \ file://1-pkg-parse--Optimize-inefficient-parsing.patch;patch=1 \ file://2-pkg-vec--Optimize-gross-inefficiency.patch;patch=1 \ + file://lonk-link-name.patch;patch=1 \ " do_stage() { |