summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
Diffstat (limited to 'meta')
-rw-r--r--meta/conf/distro/include/poky-default-revisions.inc1
-rwxr-xr-xmeta/recipes-devtools/installer/adt-installer/adt_installer2
-rw-r--r--meta/recipes-devtools/installer/adt-installer_1.0.bb8
3 files changed, 6 insertions, 5 deletions
diff --git a/meta/conf/distro/include/poky-default-revisions.inc b/meta/conf/distro/include/poky-default-revisions.inc
index 5045c9e10e..36202a1194 100644
--- a/meta/conf/distro/include/poky-default-revisions.inc
+++ b/meta/conf/distro/include/poky-default-revisions.inc
@@ -140,6 +140,7 @@ OPKGSRCREV = "596"
140SRCREV_pn-opkg ??= "${OPKGSRCREV}" 140SRCREV_pn-opkg ??= "${OPKGSRCREV}"
141SRCREV_pn-opkg-native ??= "${OPKGSRCREV}" 141SRCREV_pn-opkg-native ??= "${OPKGSRCREV}"
142SRCREV_pn-opkg-nativesdk ??= "${OPKGSRCREV}" 142SRCREV_pn-opkg-nativesdk ??= "${OPKGSRCREV}"
143SRCREV_pn-adt-installer ??= "${OPKGSRCREV}"
143SRCREV_pn-opkg-nogpg ??= "${OPKGSRCREV}" 144SRCREV_pn-opkg-nogpg ??= "${OPKGSRCREV}"
144SRCREV_pn-opkg-nogpg-native ??= "${OPKGSRCREV}" 145SRCREV_pn-opkg-nogpg-native ??= "${OPKGSRCREV}"
145SRCREV_pn-opkg-nogpg-nativesdk ??= "${OPKGSRCREV}" 146SRCREV_pn-opkg-nogpg-nativesdk ??= "${OPKGSRCREV}"
diff --git a/meta/recipes-devtools/installer/adt-installer/adt_installer b/meta/recipes-devtools/installer/adt-installer/adt_installer
index 2448d2b9f7..b1b497002e 100755
--- a/meta/recipes-devtools/installer/adt-installer/adt_installer
+++ b/meta/recipes-devtools/installer/adt-installer/adt_installer
@@ -170,7 +170,7 @@ if [ ! -x "$LOCAL_OPKG_LOC/bin/opkg-cl" ]; then
170 check_result 170 check_result
171 171
172 echo_info "Configure opkg ...\n" 172 echo_info "Configure opkg ...\n"
173 ./configure --prefix=$parent_folder/$LOCAL_OPKG_LOC --with-opkglibdir=$OPKG_LIBDIR --disable-curl --disable-ssl-curl --disable-gpg --disable-shave >> $parent_folder/$YOCTOADT_INSTALL_LOG_FILE 173 ./autogen.sh --prefix=$parent_folder/$LOCAL_OPKG_LOC --with-opkglibdir=$OPKG_LIBDIR --disable-curl --disable-ssl-curl --disable-gpg --disable-shave >> $parent_folder/$YOCTOADT_INSTALL_LOG_FILE
174 check_result 174 check_result
175 175
176 echo_info "Make opkg ...\n" 176 echo_info "Make opkg ...\n"
diff --git a/meta/recipes-devtools/installer/adt-installer_1.0.bb b/meta/recipes-devtools/installer/adt-installer_1.0.bb
index e8659716c8..50290f9ffd 100644
--- a/meta/recipes-devtools/installer/adt-installer_1.0.bb
+++ b/meta/recipes-devtools/installer/adt-installer_1.0.bb
@@ -39,7 +39,8 @@ YOCTOADT_VERSION = "${SDK_VERSION}"
39 39
40inherit deploy 40inherit deploy
41 41
42SRC_URI = "http://opkg.googlecode.com/files/opkg-0.1.8.tar.gz \ 42PV = "0.1.8+svnr${SRCPV}"
43SRC_URI = "svn://opkg.googlecode.com/svn;module=trunk;proto=http \
43 file://adt_installer \ 44 file://adt_installer \
44 file://scripts/adt_installer_internal \ 45 file://scripts/adt_installer_internal \
45 file://scripts/util \ 46 file://scripts/util \
@@ -49,8 +50,6 @@ SRC_URI = "http://opkg.googlecode.com/files/opkg-0.1.8.tar.gz \
49 file://opkg/conf/opkg-sdk-x86_64.conf \ 50 file://opkg/conf/opkg-sdk-x86_64.conf \
50 file://opkg/conf/opkg-sdk-i686.conf \ 51 file://opkg/conf/opkg-sdk-i686.conf \
51 " 52 "
52SRC_URI[md5sum] = "c714ce0e4863bf1315e3b6913ffe3299"
53SRC_URI[sha256sum] = "ff94bf30bd662d49c4b5057e3a0818d062731adaa555d59abd677ec32a3c1c60"
54 53
55fakeroot do_deploy () { 54fakeroot do_deploy () {
56 cd ${WORKDIR} 55 cd ${WORKDIR}
@@ -59,7 +58,8 @@ fakeroot do_deploy () {
59 rm -rf ${ADT_DIR} 58 rm -rf ${ADT_DIR}
60 mkdir -p ${ADT_DIR}/opkg/build 59 mkdir -p ${ADT_DIR}/opkg/build
61 cp -r opkg ${ADT_DIR}/ 60 cp -r opkg ${ADT_DIR}/
62 cp -r opkg-0.1.8 ${ADT_DIR}/opkg/build/ 61 cp -r trunk ${ADT_DIR}/opkg/build/
62 mv ${ADT_DIR}/opkg/build/trunk ${ADT_DIR}/opkg/build/opkg-svn
63 cp -r scripts ${ADT_DIR}/ 63 cp -r scripts ${ADT_DIR}/
64 cp adt_installer ${ADT_DIR} 64 cp adt_installer ${ADT_DIR}
65 cp adt_installer.conf ${ADT_DIR} 65 cp adt_installer.conf ${ADT_DIR}