extract bitbake config setting into data_define, use more variables replacing hardcoded values
(From OE-Core rev: 993a2367f881f1f4eaa10339cde93c7058660d67) Signed-off-by: Jessica Zhang <jessica.zhang@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
720b5dbc08
commit
d1df75115e
|
@ -48,7 +48,7 @@ usage ()
|
|||
echo_info "# Install Qemu:\t\t\t$YOCTOADT_QEMU"
|
||||
echo_info "# Install NFS utilities:\t$YOCTOADT_NFS_UTIL"
|
||||
#echo_info "# Install bitbake + UI:\t\t$YOCTOADT_BITBAKE"
|
||||
#echo_info "# Install poky metadata:\t$YOCTOADT_METADATA"
|
||||
#echo_info "# Install metadata:\t$YOCTOADT_METADATA"
|
||||
#echo_info "############################################################################\n"
|
||||
|
||||
echo_info "\n##############################################################################"
|
||||
|
|
|
@ -23,7 +23,7 @@
|
|||
|
||||
# Your yocto distro repository, this should include IPKG based packages and root filesystem files where the installation is based on
|
||||
|
||||
YOCTOADT_IPKG_REPO="http://adtrepo.yoctoproject.org/1.0/rootfs"
|
||||
YOCTOADT_IPKG_REPO="http://adtrepo.yoctoproject.org/$YOCTOADT_VERSION/rootfs"
|
||||
|
||||
# The following are for system wide setup
|
||||
# Target architectures that you want to setup host cross dev environment for
|
||||
|
|
|
@ -29,11 +29,11 @@ parse_config()
|
|||
case $INST_ARCH in
|
||||
i[3-6]86)
|
||||
OPKG_CONFIG_FILE=$YOCTOADT_OPKG_CONF_FILE_32
|
||||
OECORE_NATIVE_SYSROOT="$INSTALL_FOLDER/sysroots/$INST_ARCH-${SDK_VENDOR}-linux/"
|
||||
OECORE_NATIVE_SYSROOT="$INSTALL_FOLDER/sysroots/$INST_ARCH$SDK_VENDOR-linux/"
|
||||
;;
|
||||
x86_64)
|
||||
OPKG_CONFIG_FILE=$YOCTOADT_OPKG_CONF_FILE_64
|
||||
OECORE_NATIVE_SYSROOT="$INSTALL_FOLDER/sysroots/x86_64-${SDK_VENDOR}-linux/"
|
||||
OECORE_NATIVE_SYSROOT="$INSTALL_FOLDER/sysroots/x86_64$SDK_VENDOR-linux/"
|
||||
;;
|
||||
*)
|
||||
echo_info "[ADT_INST] Error: Installation Machine is not supported!"
|
||||
|
|
|
@ -37,4 +37,3 @@ YOCTOADT_SUPPORTED_TARGETS="x86 x86_64 arm ppc mips"
|
|||
# configuration files
|
||||
YOCTOADT_OPKG_CONF_FILE_32="./opkg/conf/opkg-sdk-i686.conf"
|
||||
YOCTOADT_OPKG_CONF_FILE_64="./opkg/conf/opkg-sdk-x86_64.conf"
|
||||
INSTALL_FOLDER=/opt/poky/$YOCTOADT_VERSION
|
||||
|
|
|
@ -31,7 +31,7 @@ ALLOW_EMPTY = "1"
|
|||
PACKAGES = ""
|
||||
PACKAGE_ARCH = "all"
|
||||
|
||||
PR = "r0"
|
||||
PR = "r3"
|
||||
|
||||
ADT_DEPLOY = "${TMPDIR}/deploy/sdk/"
|
||||
ADT_DIR = "${WORKDIR}/adt-installer/"
|
||||
|
@ -69,6 +69,8 @@ fakeroot do_deploy () {
|
|||
echo 'YOCTOADT_VERSION=${SDK_VERSION}' > ${ADT_DIR}/temp.conf
|
||||
cat ${ADT_DIR}/adt_installer.conf >> ${ADT_DIR}/temp.conf
|
||||
mv ${ADT_DIR}/temp.conf ${ADT_DIR}/adt_installer.conf
|
||||
echo 'SDK_VENDOR=${SDK_VENDOR}' >> ${ADT_DIR}/scripts/data_define
|
||||
echo 'INSTALL_FOLDER=${SDKPATH}' >> ${ADT_DIR}/scripts/data_define
|
||||
tar cfj adt_installer.tar.bz2 adt-installer
|
||||
cp ${WORKDIR}/adt_installer.tar.bz2 ${ADT_DEPLOY}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue