[yocto] [PATCH 1/2] adt-intaller feature implementation, including the bitbake recipe file for creating the intaller tar file under /tmp/deploy/sdk, and the adt-installer script files and config files
Signed-off-by: Jessica Zhang jessica.zh...@intel.com
---
.../installer/adt-installer/adt_installer | 363
.../installer/adt-installer/adt_installer.conf | 29 ++
.../adt-installer/opkg/conf/opkg-sdk-i586.conf |7 +
.../adt-installer/opkg/conf/opkg-sdk-x86_64.conf |7 +
.../adt-installer/scripts/adt_installer_internal | 207 +++
.../installer/adt-installer/scripts/data_define| 35 ++
.../installer/adt-installer/scripts/extract_rootfs | 63
.../installer/adt-installer/scripts/util | 99 ++
.../installer/adt-installer_1.0.bb | 61
9 files changed, 871 insertions(+), 0 deletions(-)
create mode 100755 meta/recipes-devtools/installer/adt-installer/adt_installer
create mode 100644
meta/recipes-devtools/installer/adt-installer/adt_installer.conf
create mode 100644
meta/recipes-devtools/installer/adt-installer/opkg/conf/opkg-sdk-i586.conf
create mode 100644
meta/recipes-devtools/installer/adt-installer/opkg/conf/opkg-sdk-x86_64.conf
create mode 100755
meta/recipes-devtools/installer/adt-installer/scripts/adt_installer_internal
create mode 100644
meta/recipes-devtools/installer/adt-installer/scripts/data_define
create mode 100755
meta/recipes-devtools/installer/adt-installer/scripts/extract_rootfs
create mode 100644 meta/recipes-devtools/installer/adt-installer/scripts/util
create mode 100644 meta/recipes-devtools/installer/adt-installer_1.0.bb
diff --git a/meta/recipes-devtools/installer/adt-installer/adt_installer
b/meta/recipes-devtools/installer/adt-installer/adt_installer
new file mode 100755
index 000..9ccb9cb
--- /dev/null
+++ b/meta/recipes-devtools/installer/adt-installer/adt_installer
@@ -0,0 +1,363 @@
+#/bin/bash
+# Yocto ADT Installer
+#
+# Copyright (C) 2010 Intel Corp.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 2 as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+
+
+usage ()
+{
+
+ INST_ARCH=`uname -m`
+ INST_OS=`uname -o| tr '[A-Z]' '[a-z]'`
+ INST_KR=`uname -r| tr '[A-Z]' '[a-z]'`
+
+ echo_info
#
+ echo_info # Welcome to Yocto Application Developement Tools (ADT) Installer
+ echo_info #
+ echo_info # Host Machine:\t\t\t\t$INST_ARCH
+ echo_info # OS info:\t\t\t\t$INST_KR
+ echo_info # Yocto ADT version to be installed:\t$YOCTOADT_VERSION
+ echo_info # supported target architectures:\t$YOCTOADT_SUPPORTED_TARGETS
+ echo_info # supported target root_fs images:\t$YOCTOADT_SUPPORTED_ROOTFS
+ echo_info
#\n
+
+ echo_info Systemwide installation. Installation will occur under
$INSTALL_FOLDER\n
+ echo_info
+ echo_info # Your system installation configurations from adt_installer.conf
+ echo_info
+
+ echo_info # Cross toolchains:\t\t$YOCTOADT_TARGETS
+ 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
\n
+
+echo_info
\n##
+echo_info # Your rootfs image(s) and target sysroot selections from
adt_installer.conf
+echo_info
##
+prompt=1
+for arch_type in $YOCTOADT_SUPPORTED_TARGETS; do
+ download_images $arch_type $prompt
+done
+echo_info
\n
+ select_install_type
+}
+
+validate_config()
+{
+
+ for selected_arch_type in $YOCTOADT_TARGETS; do
+found=0
+for supported_arch_type in $YOCTOADT_SUPPORTED_TARGETS; do
+ if [ $selected_arch_type == $supported_arch_type ]; then
+found=1
+break
+ fi
+done
+if [ $found == 0 ]; then
+ echo_info [ADT_INST] Error: YOCTADT_TARGETS in adt_installer.conf
contains invalid entries: $YOCTOADT_TARGETS. Valid values are:
$YOCTOADT_SUPPORTED_TARGETS
+ echo -e
[yocto] [PATCH 0/1] Resend:[Image-Creator]Make bitbake server type configurable (xmlrpc, none)
From: Liping Ke liping...@intel.com Add -t options in bitbake for configuring server type. Signed-off-by: Liping Ke liping...@intel.com Pull URL: git://git.pokylinux.org/poky-contrib.git Branch: lke/server_type Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=lke/server_type Thanks, Liping Ke liping...@intel.com --- Liping Ke (1): Make bitbake server type configurable (xmlrpc, none) bitbake/bin/bitbake | 22 +- 1 files changed, 17 insertions(+), 5 deletions(-) ___ yocto mailing list yocto@yoctoproject.org https://lists.yoctoproject.org/listinfo/yocto
[yocto] (no subject)
From: Liping Ke liping...@intel.com Subject: [PATCH 1/1] Resend:[Image-Creator]Make bitbake server type configurable (xmlrpc, none) Add -t options in bitbake for configuring server type. Signed-off-by: Liping Ke liping...@intel.com --- bitbake/bin/bitbake | 22 +- 1 files changed, 17 insertions(+), 5 deletions(-) diff --git a/bitbake/bin/bitbake b/bitbake/bin/bitbake index 6d05289..2c45224 100755 --- a/bitbake/bin/bitbake +++ b/bitbake/bin/bitbake @@ -39,8 +39,6 @@ import bb.msg from bb import cooker from bb import ui from bb import server -from bb.server import none -#from bb.server import xmlrpc __version__ = 1.11.0 logger = logging.getLogger(BitBake) @@ -71,7 +69,7 @@ def get_ui(config): return getattr(module, interface).main except AttributeError: sys.exit(FATAL: Invalid user interface '%s' specified.\n - Valid interfaces: depexp, goggle, ncurses, knotty [default]. % interface) + Valid interfaces: depexp, goggle, ncurses, hob, knotty [default]. % interface) # Display bitbake/OE warnings via the BitBake.Warnings logger, ignoring others @@ -161,6 +159,9 @@ Default BBFILES are the .bb files in the current directory.) parser.add_option(-u, --ui, help = userinterface to use, action = store, dest = ui) +parser.add_option(-t, --servertype, help = choose which server to user, none or xmlrpc, + action = store, dest = servertype) + parser.add_option(, --revisions-changed, help = Set the exit code depending on whether upstream floating revisions have changed or not, action = store_true, dest = revisions_changed, default = False) @@ -175,8 +176,19 @@ Default BBFILES are the .bb files in the current directory.) loghandler = event.LogHandler() logger.addHandler(loghandler) -#server = bb.server.xmlrpc -server = bb.server.none +# Server type could be xmlrpc or none currently, if nothing is specified, +# default server would be none +if configuration.servertype: +server_type = configuration.servertype +else: +server_type = 'none' + +try: +module = __import__(bb.server, fromlist = [server_type]) +server = getattr(module, server_type) +except AttributeError: +sys.exit(FATAL: Invalid server type '%s' specified.\n + Valid interfaces: xmlrpc [default]. % servertype) # Save a logfile for cooker into the current working directory. When the # server is daemonized this logfile will be truncated. -- 1.7.0.4 ___ yocto mailing list yocto@yoctoproject.org https://lists.yoctoproject.org/listinfo/yocto
[yocto] [PATCH 0/1] Resend:[Image-Creator]Make bitbake server type configurable (xmlrpc, none)
From: Liping Ke liping...@intel.com Add -t options in bitbake for configuring server type. Signed-off-by: Liping Ke liping...@intel.com Pull URL: git://git.pokylinux.org/poky-contrib.git Branch: lke/server_type Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=lke/server_type Thanks, Liping Ke liping...@intel.com --- Liping Ke (1): Make bitbake server type configurable(xmlrpc,none) bitbake/bin/bitbake | 22 +- 1 files changed, 17 insertions(+), 5 deletions(-) ___ yocto mailing list yocto@yoctoproject.org https://lists.yoctoproject.org/listinfo/yocto
[yocto] [PATCH 1/1] Resend:[Image-Creator]Make bitbake server type configurable(xmlrpc, none)
From: Liping Ke liping...@intel.com Add -t options in bitbake for configuring server type. Signed-off-by: Liping Ke liping...@intel.com --- bitbake/bin/bitbake | 22 +- 1 files changed, 17 insertions(+), 5 deletions(-) diff --git a/bitbake/bin/bitbake b/bitbake/bin/bitbake index 6d05289..b898f63 100755 --- a/bitbake/bin/bitbake +++ b/bitbake/bin/bitbake @@ -39,8 +39,6 @@ import bb.msg from bb import cooker from bb import ui from bb import server -from bb.server import none -#from bb.server import xmlrpc __version__ = 1.11.0 logger = logging.getLogger(BitBake) @@ -71,7 +69,7 @@ def get_ui(config): return getattr(module, interface).main except AttributeError: sys.exit(FATAL: Invalid user interface '%s' specified.\n - Valid interfaces: depexp, goggle, ncurses, knotty [default]. % interface) + Valid interfaces: depexp, goggle, ncurses, hob, knotty [default]. % interface) # Display bitbake/OE warnings via the BitBake.Warnings logger, ignoring others @@ -161,6 +159,9 @@ Default BBFILES are the .bb files in the current directory.) parser.add_option(-u, --ui, help = userinterface to use, action = store, dest = ui) +parser.add_option(-t, --servertype, help = Choose which server to user, none or xmlrpc, + action = store, dest = servertype) + parser.add_option(, --revisions-changed, help = Set the exit code depending on whether upstream floating revisions have changed or not, action = store_true, dest = revisions_changed, default = False) @@ -175,8 +176,19 @@ Default BBFILES are the .bb files in the current directory.) loghandler = event.LogHandler() logger.addHandler(loghandler) -#server = bb.server.xmlrpc -server = bb.server.none +# Server type could be xmlrpc or none currently, if nothing is specified, +# default server would be none +if configuration.servertype: +server_type = configuration.servertype +else: +server_type = 'none' + +try: +module = __import__(bb.server, fromlist = [server_type]) +server = getattr(module, server_type) +except AttributeError: +sys.exit(FATAL: Invalid server type '%s' specified.\n + Valid interfaces: none [default]. % servertype) # Save a logfile for cooker into the current working directory. When the # server is daemonized this logfile will be truncated. -- 1.7.0.4 ___ yocto mailing list yocto@yoctoproject.org https://lists.yoctoproject.org/listinfo/yocto
[yocto] [PATCH 2/4][Image Creator]Put extra requested fields into different cache files
From: Liping Ke liping...@intel.com
Data Retrive methods will be reused by Extra Cache Data fields.
It is independent Class methods for data retrieving.
Signed-off-by: Liping Ke liping...@intel.com
---
bitbake/lib/bb/cache.py |3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/bitbake/lib/bb/cache.py b/bitbake/lib/bb/cache.py
index f9d2e5f..82712ec 100644
--- a/bitbake/lib/bb/cache.py
+++ b/bitbake/lib/bb/cache.py
@@ -83,7 +83,7 @@ recipe_fields = (
)
-class RecipeInfo(namedtuple('RecipeInfo', recipe_fields)):
+class RecipeRetrieve():
__slots__ = ()
@classmethod
@@ -117,6 +117,7 @@ class RecipeInfo(namedtuple('RecipeInfo', recipe_fields)):
def getvar(cls, var, metadata):
return metadata.getVar(var, True) or ''
+class RecipeInfo(namedtuple('RecipeInfo', recipe_fields), RecipeRetrieve):
@classmethod
def make_optional(cls, default=None, **kwargs):
Construct the namedtuple from the specified keyword arguments,
--
1.7.0.4
___
yocto mailing list
yocto@yoctoproject.org
https://lists.yoctoproject.org/listinfo/yocto
