Skip to contentSkip to conversation

Minor comment/doc fixes

PATCH In review Paul Eggleton 2 participants 10 messages Apr 9, 2013

lore
Share & tools
lore
#0 lore raw

cover Minor comment/doc fixes

No functional changes, just some corrections for comments and one text file.

The following changes since commit a866e1e298dab5c52e7b8ba9ab68104604511713:

udev: Move udevd back to /sbin (2013-04-09 13:31:30 +0100)

are available in the git repository at:

git://git.openembedded.org/openembedded-core-contrib paule/layer-tweaks-core
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=paule/layer-tweaks-core

Paul Eggleton (3):
meta/recipes.txt: add recipes-lsb4
meta-*/conf/layer.conf: tweak BBFILES comment
classes/license: remove outdated comment

 meta-hob/conf/layer.conf      |    2 +-
 meta-skeleton/conf/layer.conf |    2 +-
 meta/classes/license.bbclass  |    1 -
 meta/conf/layer.conf          |    2 +-
 meta/recipes.txt              |    1 +
 5 files changed, 4 insertions(+), 4 deletions(-)
Signature · 1 line
1.7.10.4
#1 lore raw

PATCH 1/3 meta/recipes.txt: add recipes-lsb4

---
 meta/recipes.txt |    1 +
 1 file changed, 1 insertion(+)
meta/recipes.txt +1 -0
index c3aa018..705386d 100644
@@ -7,6 +7,7 @@ recipes-extended     - Applications which whilst not essential add features comp
 recipes-gnome        - All things related to the GTK+ application framework
 recipes-graphics     - X and other graphically related system libraries  
 recipes-kernel       - The kernel and generic applications/libraries with strong kernel dependencies
+recipes-lsb4         - Recipes added for the sole purpose of supporting the Linux Standard Base (LSB) 4.x
 recipes-multimedia   - Codecs and support utilties for audio, images and video
 recipes-rt           - Provides package and image recipes for using and testing the PREEMPT_RT kernel
 recipes-qt           - All things related to the Qt application framework
Signature · 1 line
1.7.10.4
#2 lore raw

PATCH 2/3 meta-*/conf/layer.conf: tweak BBFILES comment

In reply to Paul Eggleton

"packages" was the old name (pre-2010) under which the recipe files were stored.

---
 meta-hob/conf/layer.conf      |    2 +-
 meta-skeleton/conf/layer.conf |    2 +-
 meta/conf/layer.conf          |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
meta-hob/conf/layer.conf +1 -1
index 6df27ac..1785e65 100644
@@ -1,7 +1,7 @@
 # We have a conf and classes directory, add to BBPATH
 BBPATH .= ":${LAYERDIR}"
 
-# We have a packages directory, add to BBFILES
+# We have recipes-* directories, add to BBFILES
 BBFILES += "${LAYERDIR}/recipes-*/*/*.bb"
 
 BBFILE_COLLECTIONS += "hob"
meta-skeleton/conf/layer.conf +1 -1
index 10031c1..99830d8 100644
@@ -1,7 +1,7 @@
 # We have a conf and classes directory, add to BBPATH
 BBPATH .= ":${LAYERDIR}"
 
-# We have a packages directory, add to BBFILES
+# We have recipes-* directories, add to BBFILES
 BBFILES += "${LAYERDIR}/recipes-*/*/*.bb"
 
 BBFILE_COLLECTIONS += "skeleton"
meta/conf/layer.conf +1 -1
index 23ef09a..a112e86 100644
@@ -1,6 +1,6 @@
 # We have a conf and classes directory, add to BBPATH
 BBPATH .= ":${LAYERDIR}"
-# We have a packages directory, add to BBFILES
+# We have recipes-* directories, add to BBFILES
 BBFILES += "${LAYERDIR}/recipes-*/*/*.bb"
 
 BBFILE_COLLECTIONS += "core"
Signature · 1 line
1.7.10.4
#3 lore raw

Re: [PATCH 2/3] meta-*/conf/layer.conf: tweak BBFILES comment

Review

Quoted 2 lines · Paul Eggleton
(quoted diff) +1 -1
-# We have a packages directory, add to BBFILES
+# We have recipes-* directories, add to BBFILES

[etc]

Thank you :-)

#4 lore raw

PATCH 3/3 classes/license: remove outdated comment

In reply to Paul Eggleton

Package listing was implemented in the deb backend some time ago.

---
 meta/classes/license.bbclass |    1 -
 1 file changed, 1 deletion(-)
meta/classes/license.bbclass +0 -1
index 170bdd9..76749c4 100644
@@ -26,7 +26,6 @@ license_create_manifest() {
 	if [ -f ${LICENSE_MANIFEST} ]; then
 		rm ${LICENSE_MANIFEST}
 	fi
-	# list of installed packages is broken for deb
 	touch ${LICENSE_MANIFEST}
 	for pkg in ${INSTALLED_PKGS}; do
 		# not the best way to do this but licenses are not arch dependant iirc
Signature · 1 line
1.7.10.4
#5 lore raw
In reply to Paul Eggleton
Quoted 1 line · Paul Eggleton

git://git.openembedded.org/openembedded-core-contrib paule/layer-tweaks-core

This is odd... I perform a:

$ git fetch --all

But I can only find a paule/layer-tweaks and not paule/layer-tweaks-core. Yet the http:// link works fine.

Did I set something up wrong?

$ git remote -v
contrib git://git.pokylinux.org/poky-contrib (fetch)
contrib git://git.pokylinux.org/poky-contrib (push)
origin  git://git.yoctoproject.org/poky (fetch)
origin  git://git.yoctoproject.org/poky (push)
#6 lore raw

Hi Trevor,

Quoted 11 lines · On Tuesday 09 April 2013 13:51:03 Trevor Woerner wrote:
Quoted 2 lines · Paul Eggleton

git://git.openembedded.org/openembedded-core-contrib
paule/layer-tweaks-core

This is odd... I perform a:

$ git fetch --all

But I can only find a paule/layer-tweaks and not paule/layer-tweaks-core. Yet the http:// link works fine.

Quoted 7 lines

Did I set something up wrong?

$ git remote -v
contrib git://git.pokylinux.org/poky-contrib (fetch)
contrib git://git.pokylinux.org/poky-contrib (push)
origin  git://git.yoctoproject.org/poky (fetch)
origin  git://git.yoctoproject.org/poky (push)

The openembedded-core-contrib and poky-contrib repos are entirely separate. In this case I have two separate (but related) patchsets, one for the files in OE- Core (paule/layer-tweaks-core in openembedded-core-contrib), and one for the files that are just in the poky repository (paule/layer-tweaks in poky- contrib).

Cheers,
Paul

Signature · 2 lines
Paul Eggleton
Intel Open Source Technology Centre
#7 lore raw
Quoted 1 line · Paul Eggleton

The openembedded-core-contrib and poky-contrib repos are entirely separate.

D'oh!

Retrying:

$ git remote add contrib git://git.openembedded.org/meta-openembedded-contrib
$ git remote -v
contrib git://git.openembedded.org/meta-openembedded-contrib (fetch)
contrib git://git.openembedded.org/meta-openembedded-contrib (push)
origin  git://git.openembedded.org/meta-openembedded (fetch)
origin  git://git.openembedded.org/meta-openembedded (push)
$ git fetch contrib
remote: Counting objects: 1288, done.
remote: Compressing objects: 100% (554/554), done.
remote: Total 903 (delta 491), reused 592 (delta 296)
Receiving objects: 100% (903/903), 155.45 KiB | 55 KiB/s, done.
Resolving deltas: 100% (491/491), completed with 119 local objects.
From git://git.openembedded.org/meta-openembedded-contrib
 * [new branch]      gnutoo/gpsd-3.4 -> contrib/gnutoo/gpsd-3.4
 * [new branch]      gnutoo/gpsd-3.7 -> contrib/gnutoo/gpsd-3.7
 * [new branch]      gnutoo/libsdl -> contrib/gnutoo/libsdl
 * [new branch]      gnutoo/vala-0.16.0 -> contrib/gnutoo/vala-0.16.0
 * [new branch]      hrw/aarch64-support -> contrib/hrw/aarch64-support
 * [new branch]      hrw/world-cleanups -> contrib/hrw/world-cleanups
 * [new branch]      jansa/for-danny -> contrib/jansa/for-danny
 * [new branch]      jansa/for-danny2 -> contrib/jansa/for-danny2
 * [new branch]      jansa/for-danny3 -> contrib/jansa/for-danny3
 * [new branch]      jansa/in-test -> contrib/jansa/in-test
 * [new branch]      jansa/in-test-cbrake -> contrib/jansa/in-test-cbrake
 * [new branch]      jansa/in-test-felipe -> contrib/jansa/in-test-felipe
 * [new branch]      jansa/in-test-hrw -> contrib/jansa/in-test-hrw
 * [new branch]      jansa/in-test-khem -> contrib/jansa/in-test-khem
 * [new branch]      jansa/in-test-koen -> contrib/jansa/in-test-koen
 * [new branch]      jansa/in-test-ross -> contrib/jansa/in-test-ross
 * [new branch]      jansa/test -> contrib/jansa/test
 * [new branch]      jansa/world -> contrib/jansa/world
 * [new branch]      kraj/updates -> contrib/kraj/updates
 * [new branch]      master     -> contrib/master
 * [new branch]      obi/denzil -> contrib/obi/denzil
 * [new branch]      obi/master -> contrib/obi/master
 * [new branch]      paule/ajenti -> contrib/paule/ajenti
 * [new branch]      paule/cleanup6 -> contrib/paule/cleanup6
 * [new branch]      paule/collectd -> contrib/paule/collectd
 * [new branch]      ross/danny -> contrib/ross/danny
 * [new branch]      ross/gtk   -> contrib/ross/gtk
 * [new branch]      ross/master -> contrib/ross/master
 * [new branch]      ross/piglit -> contrib/ross/piglit
 * [new branch]      ross/pinpoint -> contrib/ross/pinpoint
 * [new branch]      ross/xorg  -> contrib/ross/xorg
 * [new branch]      shr        -> contrib/shr
 * [new branch]      trini/misc-v2 -> contrib/trini/misc-v2

I still don't see a paule/layer-tweaks-core :-(

#8 lore raw
Quoted 60 lines · On Tuesday 09 April 2013 14:40:32 Trevor Woerner wrote:

On Tue, Apr 9, 2013 at 2:02 PM, Paul Eggleton

Quoted 2 lines · <[email protected]> wrote:

The openembedded-core-contrib and poky-contrib repos are entirely separate.

D'oh!

Retrying:

$ git remote add contrib
git://git.openembedded.org/meta-openembedded-contrib
$ git remote -v
contrib git://git.openembedded.org/meta-openembedded-contrib (fetch)
contrib git://git.openembedded.org/meta-openembedded-contrib (push)
origin  git://git.openembedded.org/meta-openembedded (fetch)
origin  git://git.openembedded.org/meta-openembedded (push)
$ git fetch contrib
remote: Counting objects: 1288, done.
remote: Compressing objects: 100% (554/554), done.
remote: Total 903 (delta 491), reused 592 (delta 296)
Receiving objects: 100% (903/903), 155.45 KiB | 55 KiB/s, done.
Resolving deltas: 100% (491/491), completed with 119 local objects.
From git://git.openembedded.org/meta-openembedded-contrib
 * [new branch]      gnutoo/gpsd-3.4 -> contrib/gnutoo/gpsd-3.4
 * [new branch]      gnutoo/gpsd-3.7 -> contrib/gnutoo/gpsd-3.7
 * [new branch]      gnutoo/libsdl -> contrib/gnutoo/libsdl
 * [new branch]      gnutoo/vala-0.16.0 -> contrib/gnutoo/vala-0.16.0
 * [new branch]      hrw/aarch64-support -> contrib/hrw/aarch64-support
 * [new branch]      hrw/world-cleanups -> contrib/hrw/world-cleanups
 * [new branch]      jansa/for-danny -> contrib/jansa/for-danny
 * [new branch]      jansa/for-danny2 -> contrib/jansa/for-danny2
 * [new branch]      jansa/for-danny3 -> contrib/jansa/for-danny3
 * [new branch]      jansa/in-test -> contrib/jansa/in-test
 * [new branch]      jansa/in-test-cbrake -> contrib/jansa/in-test-cbrake
 * [new branch]      jansa/in-test-felipe -> contrib/jansa/in-test-felipe
 * [new branch]      jansa/in-test-hrw -> contrib/jansa/in-test-hrw
 * [new branch]      jansa/in-test-khem -> contrib/jansa/in-test-khem
 * [new branch]      jansa/in-test-koen -> contrib/jansa/in-test-koen
 * [new branch]      jansa/in-test-ross -> contrib/jansa/in-test-ross
 * [new branch]      jansa/test -> contrib/jansa/test
 * [new branch]      jansa/world -> contrib/jansa/world
 * [new branch]      kraj/updates -> contrib/kraj/updates
 * [new branch]      master     -> contrib/master
 * [new branch]      obi/denzil -> contrib/obi/denzil
 * [new branch]      obi/master -> contrib/obi/master
 * [new branch]      paule/ajenti -> contrib/paule/ajenti
 * [new branch]      paule/cleanup6 -> contrib/paule/cleanup6
 * [new branch]      paule/collectd -> contrib/paule/collectd
 * [new branch]      ross/danny -> contrib/ross/danny
 * [new branch]      ross/gtk   -> contrib/ross/gtk
 * [new branch]      ross/master -> contrib/ross/master
 * [new branch]      ross/piglit -> contrib/ross/piglit
 * [new branch]      ross/pinpoint -> contrib/ross/pinpoint
 * [new branch]      ross/xorg  -> contrib/ross/xorg
 * [new branch]      shr        -> contrib/shr
 * [new branch]      trini/misc-v2 -> contrib/trini/misc-v2
Quoted 1 line

I still don't see a paule/layer-tweaks-core :-(

Now you're looking at meta-openembedded-contrib as opposed to openembedded- core-contrib.

Cheers,
Paul

Signature · 2 lines
Paul Eggleton
Intel Open Source Technology Centre
#9 lore raw
Quoted 2 lines · Paul Eggleton

Now you're looking at meta-openembedded-contrib as opposed to openembedded- core-contrib.

So... it has come to this, eh?
http://xkcd.com/1022/