packaging
/
ostree
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'aperezdc/wip'

This commit is contained in:
Colin Walters 2012-04-25 09:56:43 -04:00
parent bf3abd02cd f685717e15
commit eac2c8df04
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gnomeos/3.4/gnomeos-3.4-src.json
View File

@ -287,7 +287,7 @@
"component": "devel"}, "component": "devel"},
{"src": "gnome:gobject-introspection"}, {"src": "gnome:gobject-introspection"},
{"src": "git:git://git.libusb.org/libusb.git", {"src": "git:git://git.libusb.org/libusb.git",
"branch": "v1.0.8", "branch": "v1.0.8",
"patches": ["libusb-autogen.patch"]}, "patches": ["libusb-autogen.patch"]},
@ -428,8 +428,8 @@
"--with-docs=no", "--with-docs=no",
"--enable-more-warnings=yes"], "--enable-more-warnings=yes"],
"patches": ["NetworkManager-config.patch"]}, "patches": ["NetworkManager-config.patch"]},
{"src": "fd:PolicyKit", {"src": "fd:polkit",
"patches": ["PolicyKit-libtool.patch"], "patches": ["PolicyKit-libtool.patch"],
"config-opts": ["--disable-man-pages"]}, "config-opts": ["--disable-man-pages"]},

8
gnomeos/README-build.md
View File

@ -75,9 +75,9 @@ cd $builddir
. $srcdir/poky/oe-init-build-env gnomeos-build . $srcdir/poky/oe-init-build-env gnomeos-build
# Now edit conf/bblayers.conf, and add # Now edit conf/bblayers.conf, and add
# /src/ostree/gnomeos/yocto # /src/poky/meta-gnomeos
# to BBLAYERS. # 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 # Also, you should choose useful values for BB_NUMBER_THREADS, PARALLEL_MAKE
bitbake ostree-native bitbake ostree-native
@ -93,12 +93,12 @@ ln -s tmp/deploy/images/repo repo
# repo=/src/build/gnomeos-build/build/repo # repo=/src/build/gnomeos-build/build/repo
# mirrordir=/src/build/ostbuild/src # mirrordir=/src/build/ostbuild/src
# workdir=/src/build/ostbuild/work # 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 # Now we want to use the "ostbuild" binary that was created
# as part of "bitbake ostree-native". You can do e.g.: # 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 # This next command will download all of the source code to the
# modules specified in $srcdir/ostree/gnomeos/3.4/manifest.json, # modules specified in $srcdir/ostree/gnomeos/3.4/manifest.json,