diff options
| author | Alejandro del Castillo <alejandro.delcastillo@ni.com> | 2015-09-08 14:24:49 -0500 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-09-09 14:25:01 +0100 |
| commit | 8683e198829b729b2f242336d9de6d79251b4be9 (patch) | |
| tree | d0bb654690bd04cb1e756584ee8a72b57a0f54b6 | |
| parent | fb3a5c732997eddee6dacb52558d4e6c8942f1e1 (diff) | |
| download | openembedded-core-8683e198829b729b2f242336d9de6d79251b4be9.tar.gz openembedded-core-8683e198829b729b2f242336d9de6d79251b4be9.tar.bz2 openembedded-core-8683e198829b729b2f242336d9de6d79251b4be9.zip | |
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
Signed-off-by: Alejandro del Castillo <alejandro.delcastillo@ni.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
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 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" 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 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 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/" 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}" 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 @@ 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 + |