* [PATCH 0/3] Misc fixes
From: Paul Eggleton @ 2011-11-04 17:52 UTC (permalink / raw)
To: openembedded-core
The following changes since commit f01fbc17b5d9bf9a227d64fe858014376cd19432:
avahi: fix useradd race condition (2011-11-03 14:48:42 +0000)
are available in the git repository at:
git://git.openembedded.org/openembedded-core-contrib paule/fixes8
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=paule/fixes8
Paul Eggleton (3):
allarch.bbclass: disable shlib and debug symbol processing
core-image-minimal-initramfs: force IMAGE_FSTYPES
qemugl: switch to new git repo
meta/classes/allarch.bbclass | 5 +++++
.../images/core-image-minimal-initramfs.bb | 1 +
meta/recipes-graphics/mesa/qemugl_git.bb | 2 +-
3 files changed, 7 insertions(+), 1 deletions(-)
--
1.7.5.4
^ permalink raw reply
* [PATCH 1/3] allarch.bbclass: disable shlib and debug symbol processing
From: Paul Eggleton @ 2011-11-04 17:52 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <cover.1320429060.git.paul.eggleton@linux.intel.com>
all-arch packages should not contain any binaries that need processing,
so disable the shared library dependency processing and debug symbol
splitting/stripping to save some time during packaging.
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
meta/classes/allarch.bbclass | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/meta/classes/allarch.bbclass b/meta/classes/allarch.bbclass
index a2f8179..18c9ae2 100644
--- a/meta/classes/allarch.bbclass
+++ b/meta/classes/allarch.bbclass
@@ -15,3 +15,8 @@ TARGET_CC_ARCH = "none"
TARGET_LD_ARCH = "none"
TARGET_AS_ARCH = "none"
PACKAGE_EXTRA_ARCHS = ""
+
+# No need to do shared library processing or debug symbol handling
+EXCLUDE_FROM_SHLIBS = "1"
+INHIBIT_PACKAGE_DEBUG_SPLIT = "1"
+INHIBIT_PACKAGE_STRIP = "1"
--
1.7.5.4
^ permalink raw reply related
* [PATCH 2/3] core-image-minimal-initramfs: force IMAGE_FSTYPES
From: Paul Eggleton @ 2011-11-04 17:52 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <cover.1320429060.git.paul.eggleton@linux.intel.com>
If the user has set their own value for IMAGE_FSTYPES, they may have
disabled the cpio.gz image type, preventing the initramfs from being
produced in the format that image-live.bbclass expects; so force
IMAGE_FSTYPES to cpio.gz within the initramfs image recipe.
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
.../images/core-image-minimal-initramfs.bb | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/meta/recipes-core/images/core-image-minimal-initramfs.bb b/meta/recipes-core/images/core-image-minimal-initramfs.bb
index 0bac27a..e4d0e51 100644
--- a/meta/recipes-core/images/core-image-minimal-initramfs.bb
+++ b/meta/recipes-core/images/core-image-minimal-initramfs.bb
@@ -13,3 +13,4 @@ LICENSE = "MIT"
inherit core-image
IMAGE_ROOTFS_SIZE = "8192"
+IMAGE_FSTYPES = "cpio.gz"
--
1.7.5.4
^ permalink raw reply related
* [PATCH 3/3] qemugl: switch to new git repo
From: Paul Eggleton @ 2011-11-04 17:52 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <cover.1320429060.git.paul.eggleton@linux.intel.com>
The qemugl git repository is now on yoctoproject.org.
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
meta/recipes-graphics/mesa/qemugl_git.bb | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/meta/recipes-graphics/mesa/qemugl_git.bb b/meta/recipes-graphics/mesa/qemugl_git.bb
index 1658759..e3552ec 100644
--- a/meta/recipes-graphics/mesa/qemugl_git.bb
+++ b/meta/recipes-graphics/mesa/qemugl_git.bb
@@ -9,7 +9,7 @@ DEPENDS = "virtual/libx11 xproto glproto libxfixes"
COMPATIBLE_HOST = '(x86_64.*|i.86.*)-(linux|freebsd.*)'
-SRC_URI = "git://git.o-hand.com/qemugl.git;protocol=git \
+SRC_URI = "git://git.yoctoproject.org/qemugl;protocol=git \
file://versionfix.patch \
file://remove-x11r6-lib-dir.patch \
file://call_opengl_fix.patch"
--
1.7.5.4
^ permalink raw reply related
* [PATCH 0/7] combo-layer enhancements
From: Paul Eggleton @ 2011-11-04 17:55 UTC (permalink / raw)
To: openembedded-core
A batch of improvements to the combo-layer tool.
The following changes since commit e3c003282afb93ec52882496400b042620ab00ef:
rt-tests: update to 0.83 (2011-11-04 15:43:19 +0000)
are available in the git repository at:
git://git.openembedded.org/openembedded-core-contrib paule/combo-layer-fixes2
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=paule/combo-layer-fixes2
Paul Eggleton (7):
scripts/combo-layer: handle merge commits
scripts/combo-layer: make init set up initial component data
scripts/combo-layer: tidy up config example
scripts/combo-layer: make component repo branch configurable
scripts/combo-layer: fix dirty repo check
scripts/combo-layer: auto-commit updated config file
scripts/combo-layer: improve some messages
scripts/combo-layer | 121 +++++++++++++++++---------------------
scripts/combo-layer.conf.example | 28 +++++++--
2 files changed, 75 insertions(+), 74 deletions(-)
--
1.7.5.4
^ permalink raw reply
* [PATCH 1/7] scripts/combo-layer: handle merge commits
From: Paul Eggleton @ 2011-11-04 17:55 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <cover.1320429268.git.paul.eggleton@linux.intel.com>
The combo-layer tool had trouble handling merge commits as they were
included in the revision list but not the patches; these are now
excluded from the revision list.
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
scripts/combo-layer | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/scripts/combo-layer b/scripts/combo-layer
index f8763ee..d6d238d 100755
--- a/scripts/combo-layer
+++ b/scripts/combo-layer
@@ -218,7 +218,7 @@ def action_update(conf, args):
logger.debug("generated patch set:\n%s" % output)
patchlist = output.splitlines()
- rev_cmd = 'git log --pretty=format:"%H" ' + rev_cmd_range
+ rev_cmd = 'git rev-list --no-merges ' + rev_cmd_range
revlist = runcmd(rev_cmd, ldir).splitlines()
# Step 3: Call repo specific hook to adjust patch
--
1.7.5.4
^ permalink raw reply related
* [PATCH 2/7] scripts/combo-layer: make init set up initial component data
From: Paul Eggleton @ 2011-11-04 17:55 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <cover.1320429268.git.paul.eggleton@linux.intel.com>
The "init" subcommand will now copy the current state of each component
repository into the combo layer repository, set last_revision for each
component, and then use "git add" to set up the initial commit (but will
not actually make the initial commit - that is left up to the user).
Also take the opportunity to bump the version number.
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
scripts/combo-layer | 22 ++++++++++++++++++++--
scripts/combo-layer.conf.example | 5 +++--
2 files changed, 23 insertions(+), 4 deletions(-)
diff --git a/scripts/combo-layer b/scripts/combo-layer
index d6d238d..db38a95 100755
--- a/scripts/combo-layer
+++ b/scripts/combo-layer
@@ -26,7 +26,7 @@ import logging
import subprocess
import ConfigParser
-__version__ = "0.1.0"
+__version__ = "0.2.0"
def logger_create():
logger = logging.getLogger("")
@@ -146,7 +146,7 @@ def runcmd(cmd,destdir=None):
def action_init(conf, args):
"""
Clone component repositories
- Check git initialised and working tree is clean
+ Check git is initialised; if not, copy initial data from component repos
"""
for name in conf.repos:
ldir = conf.repos[name]['local_repo_dir']
@@ -155,6 +155,24 @@ def action_init(conf, args):
subprocess.check_call("git clone %s %s" % (conf.repos[name]['src_uri'], ldir), shell=True)
if not os.path.exists(".git"):
runcmd("git init")
+ for name in conf.repos:
+ ldir = conf.repos[name]['local_repo_dir']
+ logger.info("copying data from %s..." % name)
+ dest_dir = conf.repos[name]['dest_dir']
+ if dest_dir and dest_dir != ".":
+ extract_dir = os.path.join(os.getcwd(), dest_dir)
+ os.makedirs(extract_dir)
+ else:
+ extract_dir = os.getcwd()
+ file_filter = conf.repos[name].get('file_filter',"")
+ runcmd("git archive master | tar -x -C %s %s" % (extract_dir, file_filter), ldir)
+ lastrev = runcmd("git rev-parse HEAD", ldir).strip()
+ conf.update(name, "last_revision", lastrev)
+ runcmd("git add .")
+ logger.info("Initial combo layer repository data has been created; please make any changes if desired and then use 'git commit' to make the initial commit.")
+ else:
+ logger.info("Repository already initialised, nothing to do.")
+
def check_repo_clean(repodir):
"""
diff --git a/scripts/combo-layer.conf.example b/scripts/combo-layer.conf.example
index 09b9415..8cee04f 100644
--- a/scripts/combo-layer.conf.example
+++ b/scripts/combo-layer.conf.example
@@ -11,8 +11,9 @@ local_repo_dir = /home/kyu3/src/test/bitbake
# use "." if it is root dir
dest_dir = bitbake
-# the updated revision last time.
-# If empty, the tool will start from the first commit
+# the last update revision.
+# "init" will set this automatically, however if it is empty when "update"
+# is run, the tool will start from the first commit.
last_revision =
# optional options
--
1.7.5.4
^ permalink raw reply related
* [PATCH 3/7] scripts/combo-layer: tidy up config example
From: Paul Eggleton @ 2011-11-04 17:55 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <cover.1320429268.git.paul.eggleton@linux.intel.com>
Move all example configuration to the example config file, tidy up a few
long lines and fix some grammar.
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
scripts/combo-layer | 47 +-------------------------------------
scripts/combo-layer.conf.example | 23 ++++++++++++++----
2 files changed, 19 insertions(+), 51 deletions(-)
diff --git a/scripts/combo-layer b/scripts/combo-layer
index db38a95..e39e4e0 100755
--- a/scripts/combo-layer
+++ b/scripts/combo-layer
@@ -42,52 +42,7 @@ class Configuration(object):
"""
Manages the configuration
- A valid conf looks like:
-
-# component name
-[bitbake]
-
-# mandatory options
-
-# git upstream uri
-src_uri = git://git.openembedded.org/bitbake
-
-# the directory to clone the component repo
-local_repo_dir = ~/src/bitbake
-
-# the relative dir to commit the repo patch
-# use "." if it is root dir
-dest_dir = bitbake
-
-# the updated revision last time.
-# leave it empty if no commit updated yet, and then the tool
-# will start from the first commit
-last_revision =
-
-# optional options
-
-# file_filter: only include the interested file
-# file_filter = [path] [path] ...
-# example:
-# file_filter = src/ : only include the subdir src
-# file_filter = src/*.c : only include the src *.c file
-# file_filter = src/main.c src/Makefile.am : only include these two files
-
-[oe-core]
-src_uri = git://git.openembedded.org/openembedded-core
-local_repo_dir = ~/src/oecore
-dest_dir = .
-last_revision =
-
-# it's also possible to embed python code in the config values. Similar
-# to bitbake it considers every value starting with @ to be a python script.
-# So local_repo could be easily configured using an environment variable as:
-#
-# [bitbake]
-# local_repo = @os.getenv("LOCAL_REPO_DIR") + "/bitbake"
-#
-
-# more components ...
+ For an example config file, see combo-layer.conf.example
"""
def __init__(self, options):
diff --git a/scripts/combo-layer.conf.example b/scripts/combo-layer.conf.example
index 8cee04f..3865829 100644
--- a/scripts/combo-layer.conf.example
+++ b/scripts/combo-layer.conf.example
@@ -1,3 +1,5 @@
+# combo-layer example configuration file
+
# component name
[bitbake]
# mandatory options
@@ -7,8 +9,8 @@ src_uri = git://git.openembedded.org/bitbake
# the directory to clone the component repo
local_repo_dir = /home/kyu3/src/test/bitbake
-# the relative dir to commit the repo patch
-# use "." if it is root dir
+# the relative dir within the combo repo to put the component files
+# use "." if the files should be in the root dir
dest_dir = bitbake
# the last update revision.
@@ -25,9 +27,10 @@ last_revision =
# file_filter = src/*.c : only include the src *.c file
# file_filter = src/main.c src/Makefile.am : only include these two files
-# hook: if provided, the tool will call the hook to process the generated patch from upstream,
-# and then apply the modified patch to combo repo
-# the hook's parameter is: ./hook patchpath revision reponame
+# hook: if provided, the tool will call the hook to process the generated
+# patch from upstream, and then apply the modified patch to the combo
+# repo.
+# the hook script is called as follows: ./hook patchpath revision reponame
# example:
# hook = combo-layer-hook-default.sh
@@ -36,3 +39,13 @@ src_uri = git://git.openembedded.org/openembedded-core
local_repo_dir = /home/kyu3/src/test/oecore
dest_dir = .
last_revision =
+
+# It is also possible to embed python code in the config values. Similar
+# to bitbake it considers every value starting with @ to be a python
+# script.
+# e.g. local_repo_dir could easily be configured using an environment
+# variable:
+#
+# [bitbake]
+# local_repo_dir = @os.getenv("LOCAL_REPO_DIR") + "/bitbake"
+#
--
1.7.5.4
^ permalink raw reply related
* [PATCH 4/7] scripts/combo-layer: make component repo branch configurable
From: Paul Eggleton @ 2011-11-04 17:55 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <cover.1320429268.git.paul.eggleton@linux.intel.com>
Add an optional per-component branch setting to allow specifying the
branch instead of always using master.
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
scripts/combo-layer | 22 ++++++++++++++--------
1 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/scripts/combo-layer b/scripts/combo-layer
index e39e4e0..4cb9ee0 100755
--- a/scripts/combo-layer
+++ b/scripts/combo-layer
@@ -108,19 +108,23 @@ def action_init(conf, args):
if not os.path.exists(ldir):
logger.info("cloning %s to %s" %(conf.repos[name]['src_uri'], ldir))
subprocess.check_call("git clone %s %s" % (conf.repos[name]['src_uri'], ldir), shell=True)
+ branch = conf.repos[name].get('branch', "master")
+ runcmd("git checkout %s" % branch, ldir)
if not os.path.exists(".git"):
runcmd("git init")
for name in conf.repos:
- ldir = conf.repos[name]['local_repo_dir']
+ repo = conf.repos[name]
+ ldir = repo['local_repo_dir']
logger.info("copying data from %s..." % name)
- dest_dir = conf.repos[name]['dest_dir']
+ dest_dir = repo['dest_dir']
if dest_dir and dest_dir != ".":
extract_dir = os.path.join(os.getcwd(), dest_dir)
os.makedirs(extract_dir)
else:
extract_dir = os.getcwd()
- file_filter = conf.repos[name].get('file_filter',"")
- runcmd("git archive master | tar -x -C %s %s" % (extract_dir, file_filter), ldir)
+ branch = repo.get('branch', "master")
+ file_filter = repo.get('file_filter', "")
+ runcmd("git archive %s | tar -x -C %s %s" % (branch, extract_dir, file_filter), ldir)
lastrev = runcmd("git rev-parse HEAD", ldir).strip()
conf.update(name, "last_revision", lastrev)
runcmd("git add .")
@@ -162,9 +166,11 @@ def action_update(conf, args):
repo = conf.repos[name]
ldir = repo['local_repo_dir']
dest_dir = repo['dest_dir']
+ branch = repo.get('branch', "master")
repo_patch_dir = os.path.join(os.getcwd(), patch_dir, name)
# Step 1: update the component repo
+ runcmd("git checkout %s" % branch, ldir)
logger.info("git pull for component repo %s in %s ..." % (name, ldir))
output=runcmd("git pull", ldir)
logger.info(output)
@@ -177,11 +183,11 @@ def action_update(conf, args):
prefix = ""
if repo['last_revision'] == "":
logger.info("Warning: last_revision of component %s is not set, so start from the first commit" % name)
- patch_cmd_range = "--root master"
- rev_cmd_range = "master"
+ patch_cmd_range = "--root %s" % branch
+ rev_cmd_range = branch
else:
- patch_cmd_range = "%s..master" % repo['last_revision']
- rev_cmd_range = "%s..master" % repo['last_revision']
+ patch_cmd_range = "%s..%s" % (repo['last_revision'], branch)
+ rev_cmd_range = patch_cmd_range
file_filter = repo.get('file_filter',"")
--
1.7.5.4
^ permalink raw reply related
* [PATCH 5/7] scripts/combo-layer: fix dirty repo check
From: Paul Eggleton @ 2011-11-04 17:55 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <cover.1320429268.git.paul.eggleton@linux.intel.com>
Fix the dirty repository check to detect any changes, including
untracked files and uncommitted changes in the index.
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
scripts/combo-layer | 8 ++------
1 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/scripts/combo-layer b/scripts/combo-layer
index 4cb9ee0..f3480dc 100755
--- a/scripts/combo-layer
+++ b/scripts/combo-layer
@@ -138,12 +138,8 @@ def check_repo_clean(repodir):
check if the repo is clean
exit if repo is dirty
"""
- try:
- runcmd("git diff --quiet", repodir)
- #TODO: also check the index using "git diff --cached"
- # but this will fail in just initialized git repo
- # so need figure out a way
- except:
+ output=runcmd("git status --porcelain", repodir)
+ if output:
logger.error("git repo %s is dirty, please fix it first", repodir)
sys.exit(1)
--
1.7.5.4
^ permalink raw reply related
* [PATCH 6/7] scripts/combo-layer: auto-commit updated config file
From: Paul Eggleton @ 2011-11-04 17:55 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <cover.1320429268.git.paul.eggleton@linux.intel.com>
If the config file is tracked within the combo-layer repository and it
is updated at the end of the "update" operation (because last_revision
has been changed), then automatically commit the file. This ensures that
multiple people can perform updates on different machines without the
last revision information going missing.
(If the file is outside the repository or is masked via .gitignore, this
will do nothing.)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
scripts/combo-layer | 12 ++++++++++++
1 files changed, 12 insertions(+), 0 deletions(-)
diff --git a/scripts/combo-layer b/scripts/combo-layer
index f3480dc..64ea9a9 100755
--- a/scripts/combo-layer
+++ b/scripts/combo-layer
@@ -230,6 +230,18 @@ def action_update(conf, args):
action_apply_patch(conf, args)
runcmd("rm -rf %s" % patch_dir)
+ # Step 7: commit the updated config file if it's being tracked
+ relpath = os.path.relpath(conf.conffile)
+ try:
+ output = runcmd("git status --porcelain %s" % relpath)
+ except:
+ # Outside the repository
+ output = None
+ if output:
+ logger.info("Committing updated configuration file")
+ if output.lstrip().startswith("M"):
+ runcmd('git commit --author="combo-layer <combo-layer@localhost>" -m "Automatic commit to update last_revision" %s' % relpath)
+
def action_apply_patch(conf, args):
"""
apply the generated patch list to combo repo
--
1.7.5.4
^ permalink raw reply related
* [PATCH 7/7] scripts/combo-layer: improve some messages
From: Paul Eggleton @ 2011-11-04 17:55 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <cover.1320429268.git.paul.eggleton@linux.intel.com>
Fix some grammar in output messages.
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
scripts/combo-layer | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/scripts/combo-layer b/scripts/combo-layer
index 64ea9a9..fbf77e6 100755
--- a/scripts/combo-layer
+++ b/scripts/combo-layer
@@ -71,7 +71,7 @@ class Configuration(object):
if option not in self.repos[name]:
msg = "%s\nOption %s is not defined for component %s" %(msg, option, name)
if msg != "":
- logger.error("configuration file %s has the following error:%s" % (self.conffile,msg))
+ logger.error("configuration file %s has the following error: %s" % (self.conffile,msg))
sys.exit(1)
# filterdiff is required by action_splitpatch, so check its availability
@@ -145,7 +145,7 @@ def check_repo_clean(repodir):
def action_update(conf, args):
"""
- update the component repo
+ update the component repos
generate the patch list
apply the generated patches
"""
@@ -178,7 +178,7 @@ def action_update(conf, args):
else:
prefix = ""
if repo['last_revision'] == "":
- logger.info("Warning: last_revision of component %s is not set, so start from the first commit" % name)
+ logger.info("Warning: last_revision of component %s is not set, starting from the first commit" % name)
patch_cmd_range = "--root %s" % branch
rev_cmd_range = branch
else:
@@ -218,12 +218,12 @@ def action_update(conf, args):
if conf.interactive:
print 'Edit the patch and patch list in %s\n' \
'For example, remove the unwanted patch entry from patchlist-*, so that it will be not applied later\n' \
- 'After finish, press following command to continue\n' \
+ 'When you are finished, run the following to continue:\n' \
' exit 0 -- exit and continue to apply the patch\n' \
- ' exit 1 -- abort and not apply patch\n' % patch_dir
+ ' exit 1 -- abort and do not apply the patch\n' % patch_dir
ret = subprocess.call(["bash"], cwd=patch_dir)
if ret != 0:
- print "Abort without applying patch"
+ print "Aborting without applying the patch"
sys.exit(0)
# Step 6: apply the generated and revised patch
@@ -257,11 +257,11 @@ def action_apply_patch(conf, args):
try:
runcmd(cmd)
except subprocess.CalledProcessError:
- logger.info('"git am --abort" is executed to cleanup repo')
+ logger.info('running "git am --abort" to cleanup repo')
runcmd("git am --abort")
logger.error('"%s" failed' % cmd)
logger.info("please manually apply patch %s" % patchfile)
- logger.info("After applying, run this tool again to apply the rest patches")
+ logger.info("After applying, run this tool again to apply the remaining patches")
conf.update(name, "last_revision", lastrev)
sys.exit(0)
conf.update(name, "last_revision", lastrev)
--
1.7.5.4
^ permalink raw reply related
* Re: [PATCH 0/7] combo-layer enhancements
From: Otavio Salvador @ 2011-11-04 18:15 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
In-Reply-To: <cover.1320429268.git.paul.eggleton@linux.intel.com>
On Fri, Nov 4, 2011 at 15:55, Paul Eggleton
<paul.eggleton@linux.intel.com> wrote:
...
> scripts/combo-layer: auto-commit updated config file
...
As said on IRC I'd prefer to the auto-commit do not replace the author
as it gives the possibility to easily figure who did the update on the
repository.
--
Otavio Salvador O.S. Systems
E-mail: otavio@ossystems.com.br http://www.ossystems.com.br
Mobile: +55 53 9981-7854 http://projetos.ossystems.com.br
^ permalink raw reply
* Re: [PATCH 2/3] core-image-minimal-initramfs: force IMAGE_FSTYPES
From: Koen Kooi @ 2011-11-04 18:18 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
In-Reply-To: <8ae5b3cd9ef609e444cc360e226f857685e2e254.1320429060.git.paul.eggleton@linux.intel.com>
[-- Attachment #1: Type: text/plain, Size: 1025 bytes --]
Op 4 nov. 2011, om 18:52 heeft Paul Eggleton het volgende geschreven:
> If the user has set their own value for IMAGE_FSTYPES, they may have
> disabled the cpio.gz image type, preventing the initramfs from being
> produced in the format that image-live.bbclass expects; so force
> IMAGE_FSTYPES to cpio.gz within the initramfs image recipe.
>
> Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
> ---
> .../images/core-image-minimal-initramfs.bb | 1 +
> 1 files changed, 1 insertions(+), 0 deletions(-)
>
> diff --git a/meta/recipes-core/images/core-image-minimal-initramfs.bb b/meta/recipes-core/images/core-image-minimal-initramfs.bb
> index 0bac27a..e4d0e51 100644
> --- a/meta/recipes-core/images/core-image-minimal-initramfs.bb
> +++ b/meta/recipes-core/images/core-image-minimal-initramfs.bb
> @@ -13,3 +13,4 @@ LICENSE = "MIT"
> inherit core-image
>
> IMAGE_ROOTFS_SIZE = "8192"
> +IMAGE_FSTYPES = "cpio.gz"
_append or += would give less suprises.
regards,
Koen
[-- Attachment #2: Message signed with OpenPGP using GPGMail --]
[-- Type: application/pgp-signature, Size: 169 bytes --]
^ permalink raw reply
* [PATCH 0/5] Misc fixes
From: Otavio Salvador @ 2011-11-04 18:20 UTC (permalink / raw)
To: openembedded-core
The following changes since commit e3c003282afb93ec52882496400b042620ab00ef:
rt-tests: update to 0.83 (2011-11-04 15:43:19 +0000)
are available in the git repository at:
git://github.com/OSSystems/oe-core master
https://github.com/OSSystems/oe-core/tree/HEAD
Otavio Salvador (5):
libcap: fix sstate for native package
files/device_table-minimal.txt: add /dev/kmsg
dhcp: drop unused dhcp3.inc file
dhcp: rename dhcp4.inc to dhcp.inc
dhcp: move server configuration to dhcp-server-config
meta/files/device_table-minimal.txt | 1 +
.../dhcp/{dhcp4.inc => dhcp.inc} | 10 +++-
meta/recipes-connectivity/dhcp/dhcp3.inc | 49 --------------------
meta/recipes-connectivity/dhcp/dhcp_4.2.0.bb | 4 +-
meta/recipes-support/libcap/libcap.inc | 15 +++++-
meta/recipes-support/libcap/libcap_2.22.bb | 2 +-
6 files changed, 24 insertions(+), 57 deletions(-)
rename meta/recipes-connectivity/dhcp/{dhcp4.inc => dhcp.inc} (91%)
delete mode 100644 meta/recipes-connectivity/dhcp/dhcp3.inc
--
1.7.2.5
^ permalink raw reply
* [PATCH 2/5] files/device_table-minimal.txt: add /dev/kmsg
From: Otavio Salvador @ 2011-11-04 18:20 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <cover.1320430778.git.otavio@ossystems.com.br>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
meta/files/device_table-minimal.txt | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/meta/files/device_table-minimal.txt b/meta/files/device_table-minimal.txt
index 495b5d5..c6e5463 100644
--- a/meta/files/device_table-minimal.txt
+++ b/meta/files/device_table-minimal.txt
@@ -15,6 +15,7 @@
/dev/hda b 660 0 6 3 0 - - -
/dev/hda b 660 0 6 3 1 1 1 20
/dev/kmem c 640 0 15 1 2 - - -
+/dev/kmsg c 600 0 0 1 11 - - -
/dev/mem c 640 0 15 1 1 - - -
/dev/null c 666 0 0 1 3 - - -
/dev/ram b 640 0 0 1 0 0 1 4
--
1.7.2.5
^ permalink raw reply related
* [PATCH 1/5] libcap: fix sstate for native package
From: Otavio Salvador @ 2011-11-04 18:20 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <cover.1320430778.git.otavio@ossystems.com.br>
The 'lib' option needs to be given on target and native builds
otherwise it installs the binaries at ${libdir}64 when host is 64bit.
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
meta/recipes-support/libcap/libcap.inc | 15 ++++++++++++---
meta/recipes-support/libcap/libcap_2.22.bb | 2 +-
2 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/meta/recipes-support/libcap/libcap.inc b/meta/recipes-support/libcap/libcap.inc
index 3506530..184b58a 100644
--- a/meta/recipes-support/libcap/libcap.inc
+++ b/meta/recipes-support/libcap/libcap.inc
@@ -21,9 +21,18 @@ do_configure() {
sed -e 's,BUILD_CFLAGS ?=,BUILD_CFLAGS := $(BUILD_CFLAGS),' -i Make.Rules
}
-EXTRA_OEMAKE = "LIBATTR=yes PAM_CAP=${@base_contains('DISTRO_FEATURES', 'pam', 'yes', 'no', d)} INDENT= SYSTEM_HEADERS=${STAGING_INCDIR} RAISE_SETFCAP=no"
-EXTRA_OEMAKE_virtclass-native = "LIBATTR=no PAM_CAP=no INDENT= "
-EXTRA_OEMAKE += " lib=${@os.path.basename('${libdir}')}"
+EXTRA_OEMAKE = " \
+ LIBATTR=yes \
+ PAM_CAP=${@base_contains('DISTRO_FEATURES', 'pam', 'yes', 'no', d)} \
+ INDENT= SYSTEM_HEADERS=${STAGING_INCDIR} RAISE_SETFCAP=no \
+ lib=${@os.path.basename('${libdir}')} \
+"
+EXTRA_OEMAKE_virtclass-native = " \
+ LIBATTR=no \
+ PAM_CAP=no \
+ INDENT= \
+ lib=${@os.path.basename('${libdir}')} \
+"
do_compile() {
oe_runmake
diff --git a/meta/recipes-support/libcap/libcap_2.22.bb b/meta/recipes-support/libcap/libcap_2.22.bb
index a31ba3f..dd63d9e 100644
--- a/meta/recipes-support/libcap/libcap_2.22.bb
+++ b/meta/recipes-support/libcap/libcap_2.22.bb
@@ -1,6 +1,6 @@
require libcap.inc
-PR = "r1"
+PR = "r2"
SRC_URI[md5sum] = "ce64058bdb3f086ddbfca8ce6c919845"
SRC_URI[sha256sum] = "73ebbd4877b5f69dd28b72098e510c5b318bc480f8201c4061ac98b78c04050f"
--
1.7.2.5
^ permalink raw reply related
* [PATCH 3/5] dhcp: drop unused dhcp3.inc file
From: Otavio Salvador @ 2011-11-04 18:20 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <cover.1320430778.git.otavio@ossystems.com.br>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
meta/recipes-connectivity/dhcp/dhcp3.inc | 49 ------------------------------
1 files changed, 0 insertions(+), 49 deletions(-)
delete mode 100644 meta/recipes-connectivity/dhcp/dhcp3.inc
diff --git a/meta/recipes-connectivity/dhcp/dhcp3.inc b/meta/recipes-connectivity/dhcp/dhcp3.inc
deleted file mode 100644
index 6c7483e..0000000
--- a/meta/recipes-connectivity/dhcp/dhcp3.inc
+++ /dev/null
@@ -1,49 +0,0 @@
-SECTION = "console/network"
-DESCRIPTION = "Internet Software Consortium DHCP package"
-HOMEPAGE = "http://www.isc.org/"
-
-LICENSE = "ISC"
-LIC_FILES_CHKSUM = "file://LICENSE;beginline=4;md5=bb6fd41f5895b67088ebea61ad365e74"
-
-SRC_URI = "ftp://ftp.isc.org/isc/dhcp/dhcp-${PV}.tar.gz \
- file://init-relay file://default-relay \
- file://init-server file://default-server \
- file://dhclient.conf file://dhcpd.conf"
-
-inherit autotools
-
-TARGET_CFLAGS += "-D_GNU_SOURCE"
-
-do_compile() {
- make RANLIB=${RANLIB} PREDEFINES='-D_PATH_DHCPD_DB=\"/var/lib/dhcp/dhcpd.leases\" \
- -D_PATH_DHCLIENT_DB=\"/var/lib/dhcp/dhclient.leases\" \
- -D_PATH_DHCLIENT_SCRIPT=\"/sbin/dhclient-script\" \
- -D_PATH_DHCPD_CONF=\"/etc/dhcp/dhcpd.conf\" \
- -D_PATH_DHCLIENT_CONF=\"/etc/dhcp/dhclient.conf\"'
-}
-
-do_install() {
- make -e DESTDIR=${D} USRMANDIR=${mandir}/man1 ADMMANDIR=${mandir}/man8 FFMANDIR=${mandir}/man5 LIBMANDIR=${mandir}/man3 LIBDIR=${libdir} INCDIR=${includedir} install
- install -d ${D}${sysconfdir}/init.d
- install -d ${D}${sysconfdir}/default
- install -d ${D}${sysconfdir}/dhcp
- install -m 0755 ${WORKDIR}/init-relay ${D}${sysconfdir}/init.d/dhcp-relay
- install -m 0644 ${WORKDIR}/default-relay ${D}${sysconfdir}/default/dhcp-relay
- install -m 0755 ${WORKDIR}/init-server ${D}${sysconfdir}/init.d/dhcp-server
- install -m 0644 ${WORKDIR}/default-server ${D}${sysconfdir}/default/dhcp-server
- install -m 0644 ${WORKDIR}/dhclient.conf ${D}${sysconfdir}/dhcp/dhclient.conf
- install -m 0644 ${WORKDIR}/dhcpd.conf ${D}${sysconfdir}/dhcp/dhcpd.conf
- install -d ${D}${base_sbindir}/
- mv ${D}${sbindir}/dhclient ${D}${base_sbindir}/
- install -m 0755 ${S}/client/scripts/linux ${D}${base_sbindir}/dhclient-script
-}
-
-PACKAGES += "dhcp-server dhcp-client dhcp-relay dhcp-omshell"
-FILES_${PN} = ""
-FILES_dhcp-server = "${sbindir}/dhcpd ${sysconfdir}/init.d/dhcp-server ${sysconfdir}/default/dhcp-server ${sysconfdir}/dhcp/dhcpd.conf"
-FILES_dhcp-relay = "${sbindir}/dhcrelay ${sysconfdir}/init.d/dhcp-relay ${sysconfdir}/default/dhcp-relay"
-
-FILES_dhcp-client = "${base_sbindir}/dhclient ${base_sbindir}/dhclient-script ${sysconfdir}/dhcp/dhclient.conf"
-RDEPENDS_dhcp-client = "bash"
-
-FILES_dhcp-omshell = "${bindir}/omshell"
--
1.7.2.5
^ permalink raw reply related
* [PATCH 4/5] dhcp: rename dhcp4.inc to dhcp.inc
From: Otavio Salvador @ 2011-11-04 18:20 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <cover.1320430778.git.otavio@ossystems.com.br>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
.../dhcp/{dhcp4.inc => dhcp.inc} | 0
meta/recipes-connectivity/dhcp/dhcp_4.2.0.bb | 2 +-
2 files changed, 1 insertions(+), 1 deletions(-)
rename meta/recipes-connectivity/dhcp/{dhcp4.inc => dhcp.inc} (100%)
diff --git a/meta/recipes-connectivity/dhcp/dhcp4.inc b/meta/recipes-connectivity/dhcp/dhcp.inc
similarity index 100%
rename from meta/recipes-connectivity/dhcp/dhcp4.inc
rename to meta/recipes-connectivity/dhcp/dhcp.inc
diff --git a/meta/recipes-connectivity/dhcp/dhcp_4.2.0.bb b/meta/recipes-connectivity/dhcp/dhcp_4.2.0.bb
index 85f473d..223522f 100644
--- a/meta/recipes-connectivity/dhcp/dhcp_4.2.0.bb
+++ b/meta/recipes-connectivity/dhcp/dhcp_4.2.0.bb
@@ -1,4 +1,4 @@
-require dhcp4.inc
+require dhcp.inc
PR = "r2"
--
1.7.2.5
^ permalink raw reply related
* [PATCH 5/5] dhcp: move server configuration to dhcp-server-config
From: Otavio Salvador @ 2011-11-04 18:20 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <cover.1320430778.git.otavio@ossystems.com.br>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
meta/recipes-connectivity/dhcp/dhcp.inc | 10 ++++++++--
meta/recipes-connectivity/dhcp/dhcp_4.2.0.bb | 2 +-
2 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/meta/recipes-connectivity/dhcp/dhcp.inc b/meta/recipes-connectivity/dhcp/dhcp.inc
index bdaa5e9..1cc529d 100644
--- a/meta/recipes-connectivity/dhcp/dhcp.inc
+++ b/meta/recipes-connectivity/dhcp/dhcp.inc
@@ -53,9 +53,15 @@ do_install_append () {
install -m 0755 ${S}/client/scripts/linux ${D}${base_sbindir}/dhclient-script
}
-PACKAGES += "dhcp-server dhcp-client dhcp-relay dhcp-omshell"
+PACKAGES += "dhcp-server dhcp-server-config dhcp-client dhcp-relay dhcp-omshell"
+
FILES_${PN} = ""
-FILES_dhcp-server = "${sbindir}/dhcpd ${sysconfdir}/init.d/dhcp-server ${sysconfdir}/default/dhcp-server ${sysconfdir}/dhcp/dhcpd.conf"
+
+FILES_dhcp-server = "${sbindir}/dhcpd ${sysconfdir}/init.d/dhcp-server"
+RRECOMMENDS_dhcp-server = "dhcp-server-config"
+
+FILES_dhcp-server-config = "${sysconfdir}/default/dhcp-server ${sysconfdir}/dhcp/dhcpd.conf"
+
FILES_dhcp-relay = "${sbindir}/dhcrelay ${sysconfdir}/init.d/dhcp-relay ${sysconfdir}/default/dhcp-relay"
FILES_dhcp-client = "${base_sbindir}/dhclient ${base_sbindir}/dhclient-script ${sysconfdir}/dhcp/dhclient.conf"
diff --git a/meta/recipes-connectivity/dhcp/dhcp_4.2.0.bb b/meta/recipes-connectivity/dhcp/dhcp_4.2.0.bb
index 223522f..8ed7d76 100644
--- a/meta/recipes-connectivity/dhcp/dhcp_4.2.0.bb
+++ b/meta/recipes-connectivity/dhcp/dhcp_4.2.0.bb
@@ -1,6 +1,6 @@
require dhcp.inc
-PR = "r2"
+PR = "r3"
SRC_URI += "file://fixincludes.patch \
file://dhcp-3.0.3-dhclient-dbus.patch;striplevel=0 \
--
1.7.2.5
^ permalink raw reply related
* OE Changelog for 2011-10-24 to 2011-10-31
From: cliff.brake @ 2011-11-04 19:49 UTC (permalink / raw)
To: openembedded-core, openembedded-devel, angstrom-distro-devel
Changelog for 2011-10-24 to 2011-10-31. Projects included in this report:
bitbake: git://git.openembedded.org/bitbake
openembedded-core: git://git.openembedded.org/openembedded-core
meta-openembedded: git://git.openembedded.org/meta-openembedded
meta-angstrom: git://git.angstrom-distribution.org/meta-angstrom
meta-yocto: git://git.yoctoproject.org/poky
meta-texasinstruments: git://git.angstrom-distribution.org/meta-texasinstruments
meta-smartphone: http://git.shr-project.org/repo/meta-smartphone.git
meta-micro: git://git.openembedded.org/meta-micro
meta-slugos: git://github.com/kraj/meta-slugos
meta-nslu2: git://github.com/kraj/meta-nslu2
meta-intel: git://git.yoctoproject.org/meta-intel
meta-handheld: git://git.openembedded.org/meta-handheld
meta-opie: git://git.openembedded.org/meta-opie
openembedded: git://git.openembedded.org/openembedded
====================================================
Changelog for bitbake:
Christopher Larson (1):
codeparser: make var_expands actually hold useful information
Cliff Brake (1):
Linefeed to test commits
Richard Purdie (1):
====================================================
Changelog for openembedded-core:
Joshua Lock (3):
libxslt: Fix packaging of xsltConf.sh
libcanberra: add new package for unpackaged files
clutter-gtk: add LIC_FILES_CHKSUM to include file
Julian Pidancet (1):
Give coreutils a chance to build the df utility
Martin Jansa (5):
libxml-parser-perl, libxml-simple-perl, expat, sgmlspl-native, git: bump PR
python: update generate-manifest for 2.7 version and regenerate it
python-2.7.2: fix build issues when additional modules are linked against ho
recipes: bump PR after python upgrade
python-dir: change PYTHON_BASEVERSION to 2.7
Matthew McClintock (2):
Add new util-linux-chkdupexe package to avoid making perl a dependecy for al
Add readline as dependecy for gdb-cross-canadian
Nitin A Kamble (2):
python, python-native: upgrade from 2.6.6 to 2.7.2
update python 2.7 manifest
Scott Garman (4):
sudo: upgrade to 1.8.3
grep: upgrade to 2.9
mtools: upgrade to 4.0.17
openssh: upgrade to 5.9p1
====================================================
Changelog for meta-openembedded:
Andreas Müller (9):
xfce.bbclass: Move static libraries to ${PN}-staticdev
xfce-panel-plugin.bbclass: pack modules also from ${libdir}/xfce4/panel-plug
xfce4-datetime-plugin: Initial add git (0.6.1)
xfce-utils: update to 4.8.3
xfce-app.bbclass: just set SRC_URI commmon to most xfce-apps
ristretto: update to 0.2.2
xfce4-eyes-plugin: initial add 4.4.1
xfce4-weather-plugin: initial add 0.7.4
evince: initial add 2.32.0
Imran Mehmood (1):
xclock: Add version 1.0.5 (initial recipe)
Joel A Fernandes (1):
memtester: Corrected recipe following review comments and guidelines
====================================================
Changelog for meta-angstrom:
Koen Kooi (2):
angstrom-uboot-scripts: adjust for oe-core
angstrom core tweaks: whitelist SOC_FAMILY for shared state dependency track
====================================================
Changelog for meta-yocto:
Julian Pidancet (1):
Give coreutils a chance to build the df utility
Martin Jansa (1):
libxml-parser-perl, libxml-simple-perl, expat, sgmlspl-native, git: bump PR
Matthew McClintock (2):
Add new util-linux-chkdupexe package to avoid making perl a dependecy for al
Add readline as dependecy for gdb-cross-canadian
Scott Garman (4):
sudo: upgrade to 1.8.3
grep: upgrade to 2.9
mtools: upgrade to 4.0.17
openssh: upgrade to 5.9p1
====================================================
Changelog for meta-texasinstruments:
Denys Dmytriyenko (3):
linux-ti33x-psp: update defconfigs for am335x-evm
README: cleanup, mostly typo and long-line fixing
linux-ti33x-psp: rebase for 3.1 release
Jason Kridner (1):
sdcard_image: align partitions with flash pages
Joel A Fernandes (2):
linux-ti33x-psp 3.1rc8: Enable usb-to-serial drivers
beaglebone-tester: Update to latest, bump PR
====================================================
Changelog for meta-smartphone:
Denis 'GNUtoo' Carikli (4):
meta-shr: shr-e-gadgets: fix SHR bug #1490
meta-shr: intone: fix LICENSE and add LIC_FILES_CHKSUM
meta-samsung: crespo: add SERIAL_CONSOLE
meta-shr: shr-e-gadgets: fix tasklist window proliferation
Klaus Kurzmann (7):
libsamsung-ipc_git: bump SRCREV
cornucopia.inc: bump FSO_CORNUCOPIA_SRCREV
shr-e-gadgets_git: bump SRCREV
ffphonelog_git: add patch to adjust to elm api changes
add u-boot for the om-gta04
ffalarms_git.bb: bump SRCREV for libeflvala changes
iliwi_git: fix for renamed vapi and changed API
Martin Jansa (7):
openssh: rename bbappend to match new version
meta-openmoko: linux-2.6.39: enable BQ27x00 module and platform battery as m
meta-smartphone: linux.inc: change KEEP_OABI default to disabled
emtooth2: bump SRCREV
Revert "meta-openmoko: linux-2.6.39: enable BQ27x00 module and platform batt
recipes: bump PR after python upgrade
recipes: bump PR after python upgrade
Simon Busch (3):
meta-shr: connman: ignore ifb0/ifb1 devices for configuration too and bump P
meta-fso: cornucopia: bump SRCREV
meta-fso: libsamsung-ipc: bump SRCREV
====================================================
Changelog for meta-micro:
====================================================
Changelog for meta-slugos:
====================================================
Changelog for meta-nslu2:
====================================================
Changelog for meta-intel:
Kishore Bodke (1):
New Romley BSP created. Uses Matrox MGA graphics driver.
Tom Zanussi (7):
meta-crownbay: README correction
meta-fri2: README correction
meta-crownbay: add linux-yocto-rt_3.0.bbappend
meta-fri2: allow linux-yocto-rt to be used for fri2-noemgd
meta-crownbay: allow linux-yocto-rt to be used for crownbay
meta-romley: Fix BSP description in romley.conf
meta-romley: change references to sugarbay in linux-yocto-rt_3.0.bbappend
====================================================
Changelog for meta-handheld:
====================================================
Changelog for meta-opie:
====================================================
Changelog for openembedded:
Chase Maupin (1):
sourceipk: dereference symlinks in sourceipk
Marco Cavallini (3):
kaeilos-2011-preferred-versions.inc: added new preferences
kaeilos.conf: updated KaeilOS version
kaeilos.conf: updated KaeilOS version
Mats Kärrman (1):
binutils_2.18: update SRC_URI to avoid manual delete
Paul Menzel (3):
id3lib: Correct `LICENSE` to `LGPLv2+` [1][2]
id3lib: Order header fields according to style guide [1]
id3lib: Add `HOMEPAGE = "http://id3lib.sourceforge.net/"` Signed-off-by:
Ulf Samuelsson (1):
binutils-2.20.1: Change source package to binutils-2.20.1a
^ permalink raw reply
* [PATCH] Introduce new SERIAL_CONSOLES to add multiple consoles for your MACHINE
From: Matthew McClintock @ 2011-11-04 21:07 UTC (permalink / raw)
To: openembedded-core
Just define additional serial consoles like so:
SERIAL_CONSOLES="115200;ttyS0 115200;ttyS1 ... 115200;ttySN"
Also be sure to remove SERIAL_CONSOLE (lacking the S) from your
machine as they can conflict.
Signed-off-by: Matthew McClintock <msm@freescale.com>
---
.../sysvinit/sysvinit-inittab_2.88dsf.bb | 10 ++++++++++
1 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb b/meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb
index ba60c74..3a716d7 100644
--- a/meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb
+++ b/meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb
@@ -25,6 +25,16 @@ do_install() {
if [ ! -z "${SERIAL_CONSOLE}" ]; then
echo "S:2345:respawn:${base_sbindir}/getty ${SERIAL_CONSOLE}" >> ${D}${sysconfdir}/inittab
fi
+
+ idx=0
+ tmp="${SERIAL_CONSOLES}"
+ for i in $tmp
+ do
+ j=`echo ${i} | sed s/\;/\ /g`
+ echo "${idx}:2345:respawn:${base_sbindir}/getty ${j}" >> ${D}${sysconfdir}/inittab
+ idx=`expr $idx + 1`
+ done
+
if [ "${USE_VT}" = "1" ]; then
cat <<EOF >>${D}${sysconfdir}/inittab
# ${base_sbindir}/getty invocations for the runlevels.
--
1.7.6.1
^ permalink raw reply related
* Re: [PATCH] Introduce new SERIAL_CONSOLES to add multiple consoles for your MACHINE
From: Phil Blundell @ 2011-11-04 21:15 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
In-Reply-To: <1320440872-28420-1-git-send-email-msm@freescale.com>
On Fri, 2011-11-04 at 16:07 -0500, Matthew McClintock wrote:
> + idx=0
> + tmp="${SERIAL_CONSOLES}"
> + for i in $tmp
> + do
> + j=`echo ${i} | sed s/\;/\ /g`
> + echo "${idx}:2345:respawn:${base_sbindir}/getty ${j}" >> ${D}${sysconfdir}/inittab
> + idx=`expr $idx + 1`
> + done
> +
> if [ "${USE_VT}" = "1" ]; then
> cat <<EOF >>${D}${sysconfdir}/inittab
> # ${base_sbindir}/getty invocations for the runlevels.
That looks like it will lose if ${SERIAL_CONSOLES} is not defined at
all.
p.
^ permalink raw reply
* Re: [PATCH 4/5] dhcp: rename dhcp4.inc to dhcp.inc
From: Phil Blundell @ 2011-11-04 21:17 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
In-Reply-To: <7e3c2e21652019ed5dd2d45beff62a855152f0a4.1320430778.git.otavio@ossystems.com.br>
On Fri, 2011-11-04 at 18:20 +0000, Otavio Salvador wrote:
> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
> ---
> .../dhcp/{dhcp4.inc => dhcp.inc} | 0
> meta/recipes-connectivity/dhcp/dhcp_4.2.0.bb | 2 +-
> 2 files changed, 1 insertions(+), 1 deletions(-)
> rename meta/recipes-connectivity/dhcp/{dhcp4.inc => dhcp.inc} (100%)
Why is this patch an improvement? I don't have anything against it
particularly but it doesn't seem that it buys much either, and there is
no clue in the commit message as to what it is trying to achieve.
p.
^ permalink raw reply
* [PATCH v2] Introduce new SERIAL_CONSOLES to add multiple consoles for your MACHINE
From: Matthew McClintock @ 2011-11-04 21:25 UTC (permalink / raw)
To: openembedded-core; +Cc: philb
In-Reply-To: <1320441301.3137.1.camel@lenovo.internal.reciva.com>
Just define additional serial consoles like so:
SERIAL_CONSOLES="115200;ttyS0 115200;ttyS1 ... 115200;ttySN"
Also be sure to remove SERIAL_CONSOLE (lacking the S) from your
machine as they can conflict.
Signed-off-by: Matthew McClintock <msm@freescale.com>
---
v2: handle case where SERIAL_CONSOLES is not defined
.../sysvinit/sysvinit-inittab_2.88dsf.bb | 12 ++++++++++++
1 files changed, 12 insertions(+), 0 deletions(-)
diff --git a/meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb b/meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb
index ba60c74..adab262 100644
--- a/meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb
+++ b/meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb
@@ -25,6 +25,18 @@ do_install() {
if [ ! -z "${SERIAL_CONSOLE}" ]; then
echo "S:2345:respawn:${base_sbindir}/getty ${SERIAL_CONSOLE}" >> ${D}${sysconfdir}/inittab
fi
+
+ idx=0
+ tmp="${SERIAL_CONSOLES}"
+ if [ "x" != "x$tmp" ]; then
+ for i in $tmp
+ do
+ j=`echo ${i} | sed s/\;/\ /g`
+ echo "${idx}:2345:respawn:${base_sbindir}/getty ${j}" >> ${D}${sysconfdir}/inittab
+ idx=`expr $idx + 1`
+ done
+ fi
+
if [ "${USE_VT}" = "1" ]; then
cat <<EOF >>${D}${sysconfdir}/inittab
# ${base_sbindir}/getty invocations for the runlevels.
--
1.7.6.1
^ permalink raw reply related
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox