summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--patches/opkg-0.2.2/0001-fix-glibc-version-check.patch22
-rw-r--r--patches/opkg-0.2.2/0002-preserve-symlink-timestamps-if-possible.patch38
-rw-r--r--patches/opkg-0.2.2/series5
-rw-r--r--projectroot/etc/opkg/opkg.conf1
-rw-r--r--rules/host-opkg.in1
-rw-r--r--rules/host-opkg.make3
-rw-r--r--rules/opkg.in1
-rw-r--r--rules/opkg.make11
-rw-r--r--scripts/lib/ptxd_make_image_prepare_work_dir.sh2
9 files changed, 10 insertions, 74 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
diff --git a/projectroot/etc/opkg/opkg.conf b/projectroot/etc/opkg/opkg.conf
index 91730123c..3ba17115b 100644
--- a/projectroot/etc/opkg/opkg.conf
+++ b/projectroot/etc/opkg/opkg.conf
@@ -6,6 +6,7 @@
@SRC@
dest root /
+option lock_file /var/lock/opkg.lock
arch @ARCH@ 10
arch all 1
diff --git a/rules/host-opkg.in b/rules/host-opkg.in
index a2b05be65..f43bf9160 100644
--- a/rules/host-opkg.in
+++ b/rules/host-opkg.in
@@ -3,6 +3,7 @@
config HOST_OPKG
tristate
default ALLYES
+ select HOST_LIBARCHIVE
select HOST_OPKG_UTILS
help
opkg is used on the development host to install packets into
diff --git a/rules/host-opkg.make b/rules/host-opkg.make
index ce402ff0d..6367f8b81 100644
--- a/rules/host-opkg.make
+++ b/rules/host-opkg.make
@@ -32,9 +32,8 @@ HOST_OPKG_ENV := $(HOST_ENV)
HOST_OPKG_CONF_TOOL := autoconf
HOST_OPKG_CONF_OPT := \
$(HOST_AUTOCONF) \
- --enable-shave \
- --with-opkglockfile=/lock \
--disable-static \
+ --disable-libopkg-api \
--disable-pathfinder \
--disable-curl \
--disable-sha256 \
diff --git a/rules/opkg.in b/rules/opkg.in
index fca58c153..c9160509c 100644
--- a/rules/opkg.in
+++ b/rules/opkg.in
@@ -2,6 +2,7 @@
menuconfig OPKG
tristate
+ select LIBARCHIVE
select LIBCURL if OPKG_CURL
select OPENSSL if OPKG_OPENSSL
prompt "opkg "
diff --git a/rules/opkg.make b/rules/opkg.make
index 324465068..be497834f 100644
--- a/rules/opkg.make
+++ b/rules/opkg.make
@@ -17,8 +17,8 @@ PACKAGES-$(PTXCONF_OPKG) += opkg
#
# Paths and names
#
-OPKG_VERSION := 0.2.2
-OPKG_MD5 := b3ecef90d67d2aed2a14c2116a027482
+OPKG_VERSION := 0.3.0
+OPKG_MD5 := 3412cdc71d78b98facc84b19331ec64e
OPKG := opkg-$(OPKG_VERSION)
OPKG_SUFFIX := tar.gz
OPKG_URL := http://downloads.yoctoproject.org/releases/opkg/$(OPKG).$(OPKG_SUFFIX)
@@ -38,14 +38,13 @@ OPKG_CONF_OPT := \
$(CROSS_AUTOCONF_USR) \
$(GLOBAL_LARGE_FILE_OPTION) \
--disable-static \
+ --disable-libopkg-api \
--$(call ptx/endis, PTXCONF_OPKG_PATHFINDER)-pathfinder \
--$(call ptx/endis, PTXCONF_OPKG_CURL)-curl \
--$(call ptx/endis, PTXCONF_OPKG_SHA256)-sha256 \
--$(call ptx/endis, PTXCONF_OPKG_OPENSSL)-openssl \
--$(call ptx/endis, PTXCONF_OPKG_SSL_CURL)-ssl-curl \
- --$(call ptx/endis, PTXCONF_OPKG_GPG)-gpg \
- --enable-shave \
- --with-opkglockfile=/var/lock/opkg.lock
+ --$(call ptx/endis, PTXCONF_OPKG_GPG)-gpg
# ----------------------------------------------------------------------------
# Target-Install
@@ -65,7 +64,7 @@ ifdef PTXCONF_OPKG_GPG
@$(call install_copy, opkg, 0, 0, 0755, -, /usr/bin/opkg-key)
endif
# @$(call install_copy, opkg, 0, 0, 0755, -, /usr/bin/update-alternatives)
- @$(call install_copy, opkg, 0, 0, 0755, $(OPKG_PKGDIR)/usr/bin/opkg-cl, /usr/bin/opkg)
+ @$(call install_copy, opkg, 0, 0, 0755, -, /usr/bin/opkg)
@$(call install_copy, opkg, 0, 0, 0755, -, /usr/share/opkg/intercept/ldconfig)
@$(call install_copy, opkg, 0, 0, 0755, -, /usr/share/opkg/intercept/depmod)
diff --git a/scripts/lib/ptxd_make_image_prepare_work_dir.sh b/scripts/lib/ptxd_make_image_prepare_work_dir.sh
index 3e8323e63..5f46a206c 100644
--- a/scripts/lib/ptxd_make_image_prepare_work_dir.sh
+++ b/scripts/lib/ptxd_make_image_prepare_work_dir.sh
@@ -61,7 +61,7 @@ ${list[*]}
ptxd_replace_magic "${ptxd_reply}" >> "${xpkg_conf}" &&
DESTDIR="${work_dir}" \
- ${ptx_xpkg_type}-cl -f "${xpkg_conf}" -o "${work_dir}" \
+ ${ptx_xpkg_type} -f "${xpkg_conf}" -o "${work_dir}" \
install "${ptxd_reply_ipkg_files[@]}" &&
# fix directory permissions
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-19 15:57:56 +0000