diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2015-11-18 08:56:03 +0100 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2015-11-25 06:45:06 +0100 |
| commit | ac004fd80a56ab53d4ba429bba159c38aa0f711c (patch) | |
| tree | 9729c2ab1412d31468aa796efbf629bdf9e756df /patches | |
| parent | b24c8bb162d7412bd33a5bd3d6b0a93a1df1cfd2 (diff) | |
| download | ptxdist-ac004fd80a56ab53d4ba429bba159c38aa0f711c.tar.gz ptxdist-ac004fd80a56ab53d4ba429bba159c38aa0f711c.tar.xz | |
opkg: version bump 0.2.2 -> 0.3.0
* remove obsolete patches. This is handled correctly now by libarchive.
* the lock-file is now configured in the config file.
* The binary is now called 'opkg' instead of 'opkg-cl'.
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'patches')
| -rw-r--r-- | patches/opkg-0.2.2/0001-fix-glibc-version-check.patch | 22 | ||||
| -rw-r--r-- | patches/opkg-0.2.2/0002-preserve-symlink-timestamps-if-possible.patch | 38 | ||||
| -rw-r--r-- | patches/opkg-0.2.2/series | 5 |
3 files changed, 0 insertions, 65 deletions
diff --git a/patches/opkg-0.2.2/0001-fix-glibc-version-check.patch b/patches/opkg-0.2.2/0001-fix-glibc-version-check.patch deleted file mode 100644 index f98feef61..000000000 --- a/patches/opkg-0.2.2/0001-fix-glibc-version-check.patch +++ /dev/null @@ -1,22 +0,0 @@ -From: Michael Olbrich <m.olbrich@pengutronix.de> -Date: Thu, 17 Jul 2014 17:47:27 +0200 -Subject: [PATCH] fix glibc version check - -Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de> ---- - libbb/unarchive.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/libbb/unarchive.c b/libbb/unarchive.c -index d583767fe9e1..e2e016b846d4 100644 ---- a/libbb/unarchive.c -+++ b/libbb/unarchive.c -@@ -237,7 +237,7 @@ extract_archive(FILE *src_stream, FILE *out_stream, - * file pointed to, so dont try and change the date or mode, lchown does - * does the right thing, but isnt available in older versions of libc */ - if (S_ISLNK(file_entry->mode)) { --#if (__GLIBC__ > 2) && (__GLIBC_MINOR__ > 1) -+#if (__GLIBC__ >= 2) && (__GLIBC_MINOR__ >= 1) - lchown(full_name, file_entry->uid, file_entry->gid); - #endif - } else { diff --git a/patches/opkg-0.2.2/0002-preserve-symlink-timestamps-if-possible.patch b/patches/opkg-0.2.2/0002-preserve-symlink-timestamps-if-possible.patch deleted file mode 100644 index 00ded7e51..000000000 --- a/patches/opkg-0.2.2/0002-preserve-symlink-timestamps-if-possible.patch +++ /dev/null @@ -1,38 +0,0 @@ -From: Michael Olbrich <m.olbrich@pengutronix.de> -Date: Thu, 17 Jul 2014 17:51:44 +0200 -Subject: [PATCH] preserve symlink timestamps if possible - -Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de> ---- - libbb/unarchive.c | 11 +++++++++++ - 1 file changed, 11 insertions(+) - -diff --git a/libbb/unarchive.c b/libbb/unarchive.c -index e2e016b846d4..ede16c2a3fc3 100644 ---- a/libbb/unarchive.c -+++ b/libbb/unarchive.c -@@ -21,6 +21,7 @@ - - #include <stdio.h> - #include <errno.h> -+#include <fcntl.h> - #include <stdlib.h> - #include <stdbool.h> - #include <string.h> -@@ -240,6 +241,16 @@ extract_archive(FILE *src_stream, FILE *out_stream, - #if (__GLIBC__ >= 2) && (__GLIBC_MINOR__ >= 1) - lchown(full_name, file_entry->uid, file_entry->gid); - #endif -+#if (__GLIBC__ >= 2) && (__GLIBC_MINOR__ >= 6) -+ if (function & extract_preserve_date) { -+ struct timespec times[2]; -+ times[0].tv_sec = file_entry->mtime; -+ times[0].tv_nsec = 0; -+ times[1].tv_sec = file_entry->mtime; -+ times[1].tv_nsec = 0; -+ utimensat(AT_FDCWD, full_name, times, AT_SYMLINK_NOFOLLOW); -+ } -+#endif - } else { - if (function & extract_preserve_date) { - t.actime = file_entry->mtime; diff --git a/patches/opkg-0.2.2/series b/patches/opkg-0.2.2/series deleted file mode 100644 index c4a9474cf..000000000 --- a/patches/opkg-0.2.2/series +++ /dev/null @@ -1,5 +0,0 @@ -# generated by git-ptx-patches -#tag:base --start-number 1 -0001-fix-glibc-version-check.patch -0002-preserve-symlink-timestamps-if-possible.patch -# 55d1324e5336fb3e01977733a9546abf - git-ptx-patches magic |