mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-04-21 12:32:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

adt-installer: upgrade to opkg 0.3.0

Browse Source 
- Opkg 0.3.0 deprecated --disable-shave & --withopkglibdir options.
- Add -i option to autoreconf since opkg tarball is missing conf.compile.
- Recreate wget_cache.patch

(From OE-Core rev: 8683e198829b729b2f242336d9de6d79251b4be9)

Signed-off-by: Alejandro del Castillo <alejandro.delcastillo@ni.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Alejandro del Castillo
2015-09-08 14:24:49 -05:00
committed by Richard Purdie
parent dd075b9e79
commit 08e09222b2
4 changed files with 23 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
meta/recipes-devtools/installer/adt-installer/adt_installer
View File

@@ -182,8 +182,8 @@ if [ ! -x "$LOCAL_OPKG_LOC/bin/opkg" ]; then
check_result
echo_info "Configure opkg ...\n"
autoreconf
./configure --prefix=$parent_folder/$LOCAL_OPKG_LOC --with-opkglibdir=$OPKG_LIBDIR --enable-shared=no --disable-curl --disable-ssl-curl --disable-gpg --disable-shave >> $parent_folder/$YOCTOADT_INSTALL_LOG_FILE
autoreconf -i
./configure --prefix=$parent_folder/$LOCAL_OPKG_LOC --enable-shared=no --disable-curl --disable-ssl-curl --disable-gpg >> $parent_folder/$YOCTOADT_INSTALL_LOG_FILE
check_result
echo_info "Make opkg ...\n"

1
meta/recipes-devtools/installer/adt-installer/scripts/data_define
View File

@@ -27,7 +27,6 @@ source `pwd`/$config_file
LOCAL_OPKG_LOC="./opkg/build/opkg"
LOCAL_OPKG_FOLDER="./opkg/build"
OPKG_LIBDIR="/var/lib"
# List all supported root fs types and target types,
# it will be used in user configuration validity checking

6
meta/recipes-devtools/installer/adt-installer_1.0.bb
View File

@@ -37,7 +37,7 @@ ADT_DEPLOY = "${DEPLOY_DIR}/sdk/"
ADT_DIR = "${WORKDIR}/adt-installer/"
S = "${WORKDIR}/opkg-${PV}"
PV = "0.2.0"
PV = "0.3.0"
SRC_URI = "http://downloads.yoctoproject.org/releases/opkg/opkg-${PV}.tar.gz \
file://wget_cache.patch \
file://adt_installer \
@@ -50,8 +50,8 @@ SRC_URI = "http://downloads.yoctoproject.org/releases/opkg/opkg-${PV}.tar.gz \
file://opkg/conf/opkg-sdk-i686.conf \
"
SRC_URI[md5sum] = "e8a6fd34fb2529191fe09dc14c934cc3"
SRC_URI[sha256sum] = "81b7055eb4c12c5e5652339305c9236cf357890717d4bea063963f3f434d966f"
SRC_URI[md5sum] = "3412cdc71d78b98facc84b19331ec64e"
SRC_URI[sha256sum] = "7f735d1cdb8ef3718fb0f9fba44ca0d9a5c90d3a7f014f37a6d2f9474f54988f"
ADTREPO ?= "http://adtrepo.yoctoproject.org/${SDK_VERSION}"

27
meta/recipes-devtools/installer/files/wget_cache.patch
View File

@@ -1,12 +1,21 @@
Upstream-Status: Inappropriate [configuration]
--- trunk/libopkg/opkg_download.c 2011-03-10 16:41:29.000000000 +0800
+++ trunk/libopkg/opkg_download.c 2011-03-10 16:42:33.000000000 +0800
@@ -162,6 +162,7 @@
---
libopkg/opkg_download_wget.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/libopkg/opkg_download_wget.c b/libopkg/opkg_download_wget.c
index 9001493..18ef91e 100644
--- a/libopkg/opkg_download_wget.c
+++ b/libopkg/opkg_download_wget.c
@@ -50,6 +50,7 @@ int opkg_download_backend(const char *src, const char *dest,
argv[i++] = "wget";
argv[i++] = "-q";
+ argv[i++] = "--no-cache";
if (conf->http_proxy || conf->ftp_proxy) {
argv[i++] = "-Y";
argv[i++] = "on";
argv[i++] = "wget";
argv[i++] = "-q";
+ argv[i++] = "--no-cache";
if (opkg_config->http_proxy || opkg_config->ftp_proxy) {
argv[i++] = "-Y";
argv[i++] = "on";
--
1.9.1