summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlejandro del Castillo <alejandro.delcastillo@ni.com>2015-09-08 14:24:49 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-09-09 14:27:48 +0100
commit08e09222b2b8a0ac4f60f02c002b185318a2110b (patch)
treedeef81b5bb558006f1e109d56f7bdd48bd0467cd
parentdd075b9e79250b6db998a583881f966befffa2e0 (diff)
downloadpoky-08e09222b2b8a0ac4f60f02c002b185318a2110b.tar.gz
adt-installer: upgrade to opkg 0.3.0
- 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>
-rwxr-xr-xmeta/recipes-devtools/installer/adt-installer/adt_installer4
-rw-r--r--meta/recipes-devtools/installer/adt-installer/scripts/data_define1
-rw-r--r--meta/recipes-devtools/installer/adt-installer_1.0.bb6
-rw-r--r--meta/recipes-devtools/installer/files/wget_cache.patch27
4 files changed, 23 insertions, 15 deletions
diff --git a/meta/recipes-devtools/installer/adt-installer/adt_installer b/meta/recipes-devtools/installer/adt-installer/adt_installer
index 3172de7bca..b8cfb2e5c5 100755
--- a/meta/recipes-devtools/installer/adt-installer/adt_installer
+++ b/meta/recipes-devtools/installer/adt-installer/adt_installer
@@ -182,8 +182,8 @@ if [ ! -x "$LOCAL_OPKG_LOC/bin/opkg" ]; then
182 check_result 182 check_result
183 183
184 echo_info "Configure opkg ...\n" 184 echo_info "Configure opkg ...\n"
185 autoreconf 185 autoreconf -i
186 ./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 186 ./configure --prefix=$parent_folder/$LOCAL_OPKG_LOC --enable-shared=no --disable-curl --disable-ssl-curl --disable-gpg >> $parent_folder/$YOCTOADT_INSTALL_LOG_FILE
187 check_result 187 check_result
188 188
189 echo_info "Make opkg ...\n" 189 echo_info "Make opkg ...\n"
diff --git a/meta/recipes-devtools/installer/adt-installer/scripts/data_define b/meta/recipes-devtools/installer/adt-installer/scripts/data_define
index 2781e77032..cfd6716134 100644
--- a/meta/recipes-devtools/installer/adt-installer/scripts/data_define
+++ b/meta/recipes-devtools/installer/adt-installer/scripts/data_define
@@ -27,7 +27,6 @@ source `pwd`/$config_file
27 27
28LOCAL_OPKG_LOC="./opkg/build/opkg" 28LOCAL_OPKG_LOC="./opkg/build/opkg"
29LOCAL_OPKG_FOLDER="./opkg/build" 29LOCAL_OPKG_FOLDER="./opkg/build"
30OPKG_LIBDIR="/var/lib"
31 30
32# List all supported root fs types and target types, 31# List all supported root fs types and target types,
33# it will be used in user configuration validity checking 32# it will be used in user configuration validity checking
diff --git a/meta/recipes-devtools/installer/adt-installer_1.0.bb b/meta/recipes-devtools/installer/adt-installer_1.0.bb
index 346fd9e4e0..22e3850706 100644
--- a/meta/recipes-devtools/installer/adt-installer_1.0.bb
+++ b/meta/recipes-devtools/installer/adt-installer_1.0.bb
@@ -37,7 +37,7 @@ ADT_DEPLOY = "${DEPLOY_DIR}/sdk/"
37ADT_DIR = "${WORKDIR}/adt-installer/" 37ADT_DIR = "${WORKDIR}/adt-installer/"
38S = "${WORKDIR}/opkg-${PV}" 38S = "${WORKDIR}/opkg-${PV}"
39 39
40PV = "0.2.0" 40PV = "0.3.0"
41SRC_URI = "http://downloads.yoctoproject.org/releases/opkg/opkg-${PV}.tar.gz \ 41SRC_URI = "http://downloads.yoctoproject.org/releases/opkg/opkg-${PV}.tar.gz \
42 file://wget_cache.patch \ 42 file://wget_cache.patch \
43 file://adt_installer \ 43 file://adt_installer \
@@ -50,8 +50,8 @@ SRC_URI = "http://downloads.yoctoproject.org/releases/opkg/opkg-${PV}.tar.gz \
50 file://opkg/conf/opkg-sdk-i686.conf \ 50 file://opkg/conf/opkg-sdk-i686.conf \
51 " 51 "
52 52
53SRC_URI[md5sum] = "e8a6fd34fb2529191fe09dc14c934cc3" 53SRC_URI[md5sum] = "3412cdc71d78b98facc84b19331ec64e"
54SRC_URI[sha256sum] = "81b7055eb4c12c5e5652339305c9236cf357890717d4bea063963f3f434d966f" 54SRC_URI[sha256sum] = "7f735d1cdb8ef3718fb0f9fba44ca0d9a5c90d3a7f014f37a6d2f9474f54988f"
55 55
56ADTREPO ?= "http://adtrepo.yoctoproject.org/${SDK_VERSION}" 56ADTREPO ?= "http://adtrepo.yoctoproject.org/${SDK_VERSION}"
57 57
diff --git a/meta/recipes-devtools/installer/files/wget_cache.patch b/meta/recipes-devtools/installer/files/wget_cache.patch
index 1281d12a3b..9117510f1f 100644
--- a/meta/recipes-devtools/installer/files/wget_cache.patch
+++ b/meta/recipes-devtools/installer/files/wget_cache.patch
@@ -1,12 +1,21 @@
1Upstream-Status: Inappropriate [configuration] 1Upstream-Status: Inappropriate [configuration]
2 2
3--- trunk/libopkg/opkg_download.c 2011-03-10 16:41:29.000000000 +0800 3---
4+++ trunk/libopkg/opkg_download.c 2011-03-10 16:42:33.000000000 +0800 4 libopkg/opkg_download_wget.c | 1 +
5@@ -162,6 +162,7 @@ 5 1 file changed, 1 insertion(+)
6
7diff --git a/libopkg/opkg_download_wget.c b/libopkg/opkg_download_wget.c
8index 9001493..18ef91e 100644
9--- a/libopkg/opkg_download_wget.c
10+++ b/libopkg/opkg_download_wget.c
11@@ -50,6 +50,7 @@ int opkg_download_backend(const char *src, const char *dest,
6 12
7 argv[i++] = "wget"; 13 argv[i++] = "wget";
8 argv[i++] = "-q"; 14 argv[i++] = "-q";
9+ argv[i++] = "--no-cache"; 15+ argv[i++] = "--no-cache";
10 if (conf->http_proxy || conf->ftp_proxy) { 16 if (opkg_config->http_proxy || opkg_config->ftp_proxy) {
11 argv[i++] = "-Y"; 17 argv[i++] = "-Y";
12 argv[i++] = "on"; 18 argv[i++] = "on";
19--
201.9.1
21