From d99b7014b512e230eabe3908962cf47bc30ee285 Mon Sep 17 00:00:00 2001 From: Adrian Perez Date: Mon, 23 Apr 2012 01:55:14 +0300 Subject: [PATCH 1/3] Some corrections in gnomeos/README-build.md --- gnomeos/README-build.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gnomeos/README-build.md b/gnomeos/README-build.md index b432276d..bd59261f 100644 --- a/gnomeos/README-build.md +++ b/gnomeos/README-build.md @@ -75,9 +75,9 @@ cd $builddir . $srcdir/poky/oe-init-build-env gnomeos-build # Now edit conf/bblayers.conf, and add -# /src/ostree/gnomeos/yocto +# /src/poky/meta-gnomeos # to BBLAYERS. -# remove tools-profile and tools-testapps from EXTRA_IMAGE_FEATURES +# Make sure tools-profile and tools-testapps are not in EXTRA_IMAGE_FEATURES # Also, you should choose useful values for BB_NUMBER_THREADS, PARALLEL_MAKE bitbake ostree-native @@ -93,12 +93,12 @@ ln -s tmp/deploy/images/repo repo # repo=/src/build/gnomeos-build/build/repo # mirrordir=/src/build/ostbuild/src # workdir=/src/build/ostbuild/work -# manifest=/src/ostree/gnomeos/3.4/manifest.json +# manifest=/src/ostree/gnomeos/3.4/gnomeos-3.4-src.json # Now we want to use the "ostbuild" binary that was created # as part of "bitbake ostree-native". You can do e.g.: -export PATH=$build/tmp-eglibc/sysroots/x86_64-linux/usr/bin:$PATH +export PATH=$builddir/build/tmp/sysroots/x86_64-linux/usr/bin:$PATH # This next command will download all of the source code to the # modules specified in $srcdir/ostree/gnomeos/3.4/manifest.json, From cff24ca458056b7288acb3658159494912188e50 Mon Sep 17 00:00:00 2001 From: Adrian Perez Date: Mon, 23 Apr 2012 01:56:15 +0300 Subject: [PATCH 2/3] manifest: Fix path of PolicyKit repository The old path being used is no longer available, making "ostbuild resolve" bail out when trying to clone the repository. --- gnomeos/3.4/gnomeos-3.4-src.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnomeos/3.4/gnomeos-3.4-src.json b/gnomeos/3.4/gnomeos-3.4-src.json index fcf7e9b1..2a33f4af 100644 --- a/gnomeos/3.4/gnomeos-3.4-src.json +++ b/gnomeos/3.4/gnomeos-3.4-src.json @@ -429,7 +429,7 @@ "--enable-more-warnings=yes"], "patches": ["NetworkManager-config.patch"]}, - {"src": "fd:PolicyKit", + {"src": "fd:polkit", "patches": ["PolicyKit-libtool.patch"], "config-opts": ["--disable-man-pages"]}, From f685717e158f2afead00106649203c8e7e79fb02 Mon Sep 17 00:00:00 2001 From: Adrian Perez Date: Tue, 24 Apr 2012 03:39:01 +0300 Subject: [PATCH 3/3] Remove trailing whitespace --- gnomeos/3.4/gnomeos-3.4-src.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnomeos/3.4/gnomeos-3.4-src.json b/gnomeos/3.4/gnomeos-3.4-src.json index 2a33f4af..eaf54c0b 100644 --- a/gnomeos/3.4/gnomeos-3.4-src.json +++ b/gnomeos/3.4/gnomeos-3.4-src.json @@ -287,7 +287,7 @@ "component": "devel"}, {"src": "gnome:gobject-introspection"}, - + {"src": "git:git://git.libusb.org/libusb.git", "branch": "v1.0.8", "patches": ["libusb-autogen.patch"]}, @@ -428,7 +428,7 @@ "--with-docs=no", "--enable-more-warnings=yes"], "patches": ["NetworkManager-config.patch"]}, - + {"src": "fd:polkit", "patches": ["PolicyKit-libtool.patch"], "config-opts": ["--disable-man-pages"]},