Re: [OE-core] [PATCH 2/2] systemd: add more compression and importd PACKAGECONFIGs

2016-01-04 Thread Khem Raj
On Mon, Jan 4, 2016 at 2:23 AM, Ross Burton wrote: > Add explicit PACKAGECONFIGs for all of compression formats that systemd can > detect at configure time, and an explicit enable/disable for importd. importd > defaults to disabled as it needs curl and all the compression

[OE-core] [RFT] glibc 2.23

2016-01-04 Thread Khem Raj
Hi All, I have put together patchset for upcoming glibc 2.23 release here https://github.com/kraj/openembedded-core/tree/kraj/glibc-2.23 There are two patches that you would need to cherry-pick https://github.com/kraj/openembedded-core/commit/8f6392f59c83117da07a1ebe25b9cbbdf79a6df5

Re: [OE-core] [oe] [RFC] Delete all .la files?

2016-01-04 Thread Phil Blundell
On Mon, 2016-01-04 at 17:28 +, Burton, Ross wrote: > Technicalities time: should this be a new class that is in the default > INHERIT_DISTRO? Or directly integrated into base.bbclass? Does anyone > have a strong opinion either way? I think I'd still be inclined to put it in

Re: [OE-core] [oe] [RFC] Mark of upstream CVE patches

2016-01-04 Thread Benjamin Esquivel
On Mon, 2016-01-04 at 12:25 -0600, Mariano Lopez wrote: > > On 12/16/2015 03:21 AM, Burton, Ross wrote: > > > > On 16 December 2015 at 09:03, Sona Sarmadi > > wrote: > > > > We are supposed to have reference to the CVE identifier both

Re: [OE-core] [PATCH 2/2] systemd: add more compression and importd PACKAGECONFIGs

2016-01-04 Thread Burton, Ross
On 4 January 2016 at 18:36, Khem Raj wrote: > Would it thow some sensible configure errors on enabling importd > without the dependencies ? now that they are packageconfigs on their > own. ? > No, basically currently if you enable enough options then importd enables itself

Re: [OE-core] [meta-oe][PATCH] mkefidisk.sh: add boot log on console

2016-01-04 Thread Trevor Woerner
On 01/04/16 11:20, Burton, Ross wrote: > > On 31 December 2015 at 22:07, Trevor Woerner > wrote: > > ping? > > > Sorry, slipped through. These are staged in ross/mut as of now. Thanks Ross -- ___

[OE-core] [oe][fido][PATCH] Corrects the URI of the openssl's recipe from fido. The sources were moved to a new subdirectory.

2016-01-04 Thread Thomas Perrot
Signed-off-by: Thomas Perrot --- meta/recipes-connectivity/openssl/openssl.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-connectivity/openssl/openssl.inc b/meta/recipes-connectivity/openssl/openssl.inc index ba9bca6..a5b8ed3 100644

Re: [OE-core] [PATCH v2 0/3] Debian multilib packaging fixes

2016-01-04 Thread Aníbal Limón
Hi Matt, Sorry for the delay in the response, i'll test again your patches with the new one and the same error appears when build core-image-full-cmdline or core-image-sato. MACHINE ??= "qemux86-64" IMAGE_INSTALL_append = " lib32-connman" require conf/multilib.conf

Re: [OE-core] [RFC] Delete all .la files?

2016-01-04 Thread Clemens Lang
Hi, On Wed, Dec 23, 2015 at 09:41:35PM +, Burton, Ross wrote: > One recipe (opensp-native) needs to opt out of the .la deletion as > openjade-native for reasons explicitly expects .la files to > be installed. Some other desktop distros already strip out .la files > so I wouldn't be

Re: [OE-core] [PATCH v2] uievent: refactor retry loop

2016-01-04 Thread Ed Bartosh
wrong list. please ignore. On Mon, Jan 04, 2016 at 10:12:16AM +0200, Ed Bartosh wrote: > Replaced 'while' loop with 'for' loop. > Made the code more compact and hopefully more understandable. > > Signed-off-by: Ed Bartosh > --- > bitbake/lib/bb/ui/uievent.py | 12

[OE-core] [PATCH 1/2] openjade: Fix build if not installing the libtool-garbage

2016-01-04 Thread Ross Burton
From: Phil Blundell The openjade build system is slightly funky and does strange things with library dependencies. Fix it up so that it depends on the .so rather than the .la (which may not exist) for libraries from the sysroot. Signed-off-by: Ross Burton

[OE-core] [PATCH 2/2] systemd: add more compression and importd PACKAGECONFIGs

2016-01-04 Thread Ross Burton
Add explicit PACKAGECONFIGs for all of compression formats that systemd can detect at configure time, and an explicit enable/disable for importd. importd defaults to disabled as it needs curl and all the compression formats to be enabled. Signed-off-by: Ross Burton ---

Re: [OE-core] RFC: Split do_rootfs into image specific tasks?

2016-01-04 Thread Patrick Ohly
On Mon, 2015-12-28 at 13:00 +, Richard Purdie wrote: > I've heard complaints from people trying to create more interesting > image types about how hard it is to understand the rootfs/image > generation code and that its a pain to develop/test/debug. [...] > I guess the real question is whether

[OE-core] [PATCH][V2] openjade: Fix build if not installing the libtool-garbage

2016-01-04 Thread Ross Burton
From: Phil Blundell The openjade build system is slightly funky and does strange things with library dependencies. Fix it up so that it depends on the .so rather than the .la (which may not exist) for libraries from the sysroot. Signed-off-by: Ross Burton

Re: [OE-core] [PATCH 1/1] Revert "glib-2.0: build dependency cleanup"

2016-01-04 Thread Burton, Ross
On 29 December 2015 at 09:43, wrote: > This reverts commit fcd7494b347423185c883b2897c4908929843a71. > Why revert? Just adding glib-2.0-native to DEPENDS is sufficient, no need to revert the other improvements in that commit. Ross --

Re: [OE-core] gobject introspection - distccd?

2016-01-04 Thread Burton, Ross
On 4 January 2016 at 11:50, Chris Trobridge wrote: > I will test this out more thoroughly when I can build yocto again, but is > it possible the gobject-introspection recipe is somehow causing distcc to > be added to the target? > More likely some of the existing

[OE-core] [PATCH v2] uievent: refactor retry loop

2016-01-04 Thread Ed Bartosh
Replaced 'while' loop with 'for' loop. Made the code more compact and hopefully more understandable. Signed-off-by: Ed Bartosh --- bitbake/lib/bb/ui/uievent.py | 12 +--- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git

Re: [OE-core] [PATCH] perl: install Config_heavy-target.pl correctly

2016-01-04 Thread Rongqing Li
Sorry for the noise; please drop this patch -Roy On 2015年12月30日 17:18, rongqing...@windriver.com wrote: From: Roy Li Config_heavy-target.pl is needed by perl-native, not perl; since perl-configpm-switch.patch, which uses Config_heavy-target.pl, is applied into

Re: [OE-core] [PATCH 1/1] linux-firmware: remove hard-coded paths

2016-01-04 Thread Matthias Schiffer
On 01/04/2016 05:32 PM, Mark Hatle wrote: > On 1/4/16 10:11 AM, Matthias Schiffer wrote: >> On 01/04/2016 02:14 PM, Ian Ray wrote: >>> The recipe uses hard-coded paths (specifically /lib) in do_install >>> and in FILES, however on a merged /usr system this directory might >>> not exist. Prefer

Re: [OE-core] [PATCH v2 2/3] base-files: create ${base_bindir} etc. instead of /bin, /sbin and /lib

2016-01-04 Thread Mark Hatle
On 1/4/16 5:46 PM, Matthias Schiffer wrote: > On 01/04/2016 11:59 PM, Mark Hatle wrote: >> On 1/2/16 5:53 PM, Matthias Schiffer wrote: >>> These directories conflict with the symlinks created for merged-usr setups. >>> >>> Signed-off-by: Matthias Schiffer >>> ---

Re: [OE-core] [PATCH 1/1] linux-firmware: remove hard-coded paths

2016-01-04 Thread Matthias Schiffer
On 01/04/2016 11:56 PM, Mark Hatle wrote: > On 1/4/16 4:26 PM, Matthias Schiffer wrote: >> On 01/04/2016 05:32 PM, Mark Hatle wrote: >>> On 1/4/16 10:11 AM, Matthias Schiffer wrote: On 01/04/2016 02:14 PM, Ian Ray wrote: > The recipe uses hard-coded paths (specifically /lib) in do_install

Re: [OE-core] [PATCH v2 2/3] base-files: create ${base_bindir} etc. instead of /bin, /sbin and /lib

2016-01-04 Thread Matthias Schiffer
On 01/04/2016 11:59 PM, Mark Hatle wrote: > On 1/2/16 5:53 PM, Matthias Schiffer wrote: >> These directories conflict with the symlinks created for merged-usr setups. >> >> Signed-off-by: Matthias Schiffer >> --- >> v2: create both ${base_libdir} and

Re: [OE-core] [PATCH v2 3/3] base-files: create typical merged /usr symlinks if the "merged-usr" distro feature is set

2016-01-04 Thread Mark Hatle
On 1/2/16 5:53 PM, Matthias Schiffer wrote: > The typical symlinks are: > > * /bin -> usr/bin > * /sbin -> usr/sbin > * /lib -> usr/lib > * /usr/sbin -> bin > > It is checked that only sane symlinks are created, so a half-merged /usr > (e.g, merging bin and sbin, but not lib) is feasible as

Re: [OE-core] [PATCH v2 2/3] base-files: create ${base_bindir} etc. instead of /bin, /sbin and /lib

2016-01-04 Thread Mark Hatle
On 1/2/16 5:53 PM, Matthias Schiffer wrote: > These directories conflict with the symlinks created for merged-usr setups. > > Signed-off-by: Matthias Schiffer > --- > v2: create both ${base_libdir} and ${nonarch_base_libdir} > >

Re: [OE-core] [PATCH v2 3/3] base-files: create typical merged /usr symlinks if the "merged-usr" distro feature is set

2016-01-04 Thread Matthias Schiffer
On 01/03/2016 02:01 PM, Phil Blundell wrote: > On Sun, 2016-01-03 at 00:53 +0100, Matthias Schiffer wrote: >> +PACKAGECONFIG ??= " \ >> + ${@bb.utils.contains('DISTRO_FEATURES', >> 'merged-usr','merged-usr', '', d)} \ > > Why is this DISTRO_FEATURE (or the corresponding

Re: [OE-core] [PATCH 1/1] linux-firmware: remove hard-coded paths

2016-01-04 Thread Mark Hatle
On 1/4/16 4:26 PM, Matthias Schiffer wrote: > On 01/04/2016 05:32 PM, Mark Hatle wrote: >> On 1/4/16 10:11 AM, Matthias Schiffer wrote: >>> On 01/04/2016 02:14 PM, Ian Ray wrote: The recipe uses hard-coded paths (specifically /lib) in do_install and in FILES, however on a merged /usr

Re: [OE-core] [PATCH 1/1] linux-firmware: remove hard-coded paths

2016-01-04 Thread Mark Hatle
On 1/4/16 5:57 PM, Matthias Schiffer wrote: > On 01/04/2016 11:56 PM, Mark Hatle wrote: >> On 1/4/16 4:26 PM, Matthias Schiffer wrote: >>> On 01/04/2016 05:32 PM, Mark Hatle wrote: On 1/4/16 10:11 AM, Matthias Schiffer wrote: > On 01/04/2016 02:14 PM, Ian Ray wrote: >> The recipe uses

Re: [OE-core] [PATCH 1/1] linux-firmware: remove hard-coded paths

2016-01-04 Thread Matthias Schiffer
On 01/05/2016 01:28 AM, Mark Hatle wrote: > On 1/4/16 5:57 PM, Matthias Schiffer wrote: >> On 01/04/2016 11:56 PM, Mark Hatle wrote: >>> On 1/4/16 4:26 PM, Matthias Schiffer wrote: On 01/04/2016 05:32 PM, Mark Hatle wrote: > On 1/4/16 10:11 AM, Matthias Schiffer wrote: >> On

[OE-core] [PATCH 0/1] classes/buildhistory: actually use KiB in extensible SDK sizes files

2016-01-04 Thread Paul Eggleton
Fix a minor mistake in my recent buildhistory extensible SDK changes. The following changes since commit 1568f4fa1c8f8abd9b365ecd264841cd4f6b66b1: bluez5: include the patch only for 5.36 (2015-12-28 13:02:03 +) are available in the git repository at:

[OE-core] [PATCH 1/1] classes/buildhistory: actually use KiB in extensible SDK sizes files

2016-01-04 Thread Paul Eggleton
I was using bytes here for the sizes and writing out KiB as the suffix. Change it to actually write out size values in KiB. Signed-off-by: Paul Eggleton --- meta/classes/buildhistory.bbclass | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git

[OE-core] [PATCH] selftest: moved tc test_buildhistory_does_not_change_signatures

2016-01-04 Thread Daniel Istrate
Moved test_buildhistory_does_not_change_signatures from buildhistory/BuildhistoryBase to buildoptions/BuildhistoryTests. The test being in the base class was causing it to run multiple times. Fix for [YOCTO #8867] Signed-off-by: Daniel Istrate ---

[OE-core] [PATCH 1/2] sstate-sysroot-cruft.sh: Extend the whitelist

2016-01-04 Thread Martin Jansa
* add more php5 entries * add builder user (from builder.bb) * add .bashrc and .profile in HOME directory of created user * add imgdata directory generated by image.py Signed-off-by: Martin Jansa --- scripts/sstate-sysroot-cruft.sh | 18 +++--- 1 file

[OE-core] [PATCH 2/2] pulseaudio: add PACKAGECONFIG for lirc

2016-01-04 Thread Martin Jansa
* it's autodetected from sysroot Signed-off-by: Martin Jansa --- meta/recipes-multimedia/pulseaudio/pulseaudio.inc | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc

Re: [OE-core] gobject introspection - distccd?

2016-01-04 Thread Alexander Kanavin
On 01/04/2016 02:24 PM, Chris Trobridge wrote: That's what I was thinking: gobject-introspection doesn't call it in directly but it does require compilation to be performed on the 'target' system and that could pull it in indirectly. g-introspection does not require compilation to be performed

Re: [OE-core] [PATCH] oe-selftest: Improved --list-classes when determining test names

2016-01-04 Thread Burton, Ross
On 4 January 2016 at 12:25, Daniel Istrate < daniel.alexandrux.istr...@intel.com> wrote: > +if method.startswith("test_") and > hasattr(vars(t)[method], '__call__'): > Using callable() instead of hasattr() would be neater. Ross --

[OE-core] [PATCH 1/1] linux-firmware: remove hard-coded paths

2016-01-04 Thread Ian Ray
The recipe uses hard-coded paths (specifically /lib) in do_install and in FILES, however on a merged /usr system this directory might not exist. Prefer base_libdir. Signed-off-by: Ian Ray --- .../linux-firmware/linux-firmware_git.bb | 134 ++--- 1 file

Re: [OE-core] gobject introspection - distccd?

2016-01-04 Thread Chris Trobridge
That's what I was thinking: gobject-introspection doesn't call it in directly but it does require compilation to be performed on the 'target' system and that could pull it in indirectly. distcc (and hence avahi) are not required, so is this a general problem or just something I should

Re: [OE-core] [PATCHv2] oe-selftest: Improved --list-classes when determining test names

2016-01-04 Thread Istrate, Daniel AlexandruX
Used callable() instead of hasattr(). -Original Message- From: Istrate, Daniel AlexandruX Sent: Monday, January 4, 2016 15:44 To: openembedded-core@lists.openembedded.org Cc: Istrate, Daniel AlexandruX Subject: [PATCHv2] oe-selftest: Improved

[OE-core] State of bitbake world, Failed tasks 2016-01-04

2016-01-04 Thread Martin Jansa
This may look like improvement, but that's only qemux86-64 failed to build linux-yocto again. == Failed tasks 2016-01-04 == INFO: jenkins-job.sh-1.7.0 Complete log available at http://logs.nslu2-linux.org/buildlogs/oe/world/log.report.20160104_040826.log === common (8) === *

[OE-core] [PATCHv2] oe-selftest: Improved --list-classes when determining test names

2016-01-04 Thread Daniel Istrate
--list-classes does a weak validation when determining test names: (if method.startswith("test_") which could report any class attribute that starts with 'test_' as a valid test case. This fix checks that the class attribute that starts with 'test_' is also callable (is a method). Fix for [YOCTO

[OE-core] [PATCH] gcc-sanitizers: link directly against sysroot libstc++

2016-01-04 Thread Ross Burton
Instead of building a shadow libstdc++-v3 directory with symlinks to the sysroot libstdc++-v3.la, fiddle the Makefiles so that it doesn't attempt to link to a in-tree library at all. This fixes builds where .la files are not being installed into the sysroot at all. Signed-off-by: Ross Burton

[OE-core] [PATCH 0/1] More fixes for a distro with a merged /usr

2016-01-04 Thread Ian Ray
When building a distro with a merged /usr[1] the linux-firmware recipe causes /lib to be re-created because of hard-coded paths. Tested by building an image and verifying that rootfs contains a link from lib to usr/lib as expected. 1.

Re: [OE-core] gobject introspection - distccd?

2016-01-04 Thread Chris Trobridge
Problem solved - nothing to do with gobject introspection but from the other change I had made, to build for qemu. packagegroup-core-device-devel is pulled in for qemu targets in poky.conf and packagegroup-core-device-devel rdepends on distcc-config. > To:

[OE-core] [PATCH 1/1] image/populate_sdk: seprate variables to fix dependency

2016-01-04 Thread Chen Qi
Previously, do_rootfs depends on variables like SDK_OS, SDK_OUTPUT, etc. And changing variables like POPULATE_SDK_POST_HOST_COMMAND doesn't cause do_populate_sdk to rerun. This patch separates variables so that do_rootfs and do_populate_sdk could correctly depend on their related variables.

[OE-core] [PATCH 0/1] image/populate_sdk: seprate variables to fix dependency

2016-01-04 Thread Chen Qi
The following changes since commit 80b3974081c4a8c604e23982a6db8fb32c616058: sstate: Ensure siginfo and sig files are also touched (2015-11-25 08:08:51 +) are available in the git repository at: git://git.openembedded.org/openembedded-core-contrib ChenQi/bug8670

[OE-core] [PATCH] oe-selftest: New option --list-tests

2016-01-04 Thread Daniel Istrate
This option will list all available tests in a comprehensive manner. Fix for [YOCTO #8868] Signed-off-by: Daniel Istrate --- scripts/oe-selftest | 21 + 1 file changed, 21 insertions(+) diff --git a/scripts/oe-selftest

Re: [OE-core] [PATCH V1 1/3] kernel.bbclass: do not install initramfs bundled kernel image

2016-01-04 Thread Bruce Ashfield
On 15-12-30 04:19 PM, Ming Liu wrote: From: Ming Liu It makes no sense to install a initramfs bundled kernel image since do_package does not depend on do_bundle_initramfs at all, otherwise, it leads to a impicit kernel-image package depending on do_package

[OE-core] [PATCH] matchbox-keyboard: export GTK_IM_MODULE_FILE location

2016-01-04 Thread Maxin B. John
This commit in gtk+ moved the cache files below " commit c8849046860a9b17fa943247d85ddadb29262b48 Author: Matthias Clasen Date: Thu Jul 4 09:27:17 2013 -0400 Move the module cache files below libdir These files contain architecture-dependent paths, and thus placing them

Re: [OE-core] [PATCH 1/1] linux-firmware: remove hard-coded paths

2016-01-04 Thread Matthias Schiffer
On 01/04/2016 02:14 PM, Ian Ray wrote: > The recipe uses hard-coded paths (specifically /lib) in do_install > and in FILES, however on a merged /usr system this directory might > not exist. Prefer base_libdir. > > Signed-off-by: Ian Ray > --- This should use nonarch_base_libdir,

Re: [OE-core] [meta-oe][PATCH] mkefidisk.sh: add boot log on console

2016-01-04 Thread Burton, Ross
On 31 December 2015 at 22:07, Trevor Woerner wrote: > ping? > Sorry, slipped through. These are staged in ross/mut as of now. Ross -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org

Re: [OE-core] [PATCH 1/1] linux-firmware: remove hard-coded paths

2016-01-04 Thread Mark Hatle
On 1/4/16 10:11 AM, Matthias Schiffer wrote: > On 01/04/2016 02:14 PM, Ian Ray wrote: >> The recipe uses hard-coded paths (specifically /lib) in do_install >> and in FILES, however on a merged /usr system this directory might >> not exist. Prefer base_libdir. >> >> Signed-off-by: Ian Ray

Re: [OE-core] [RFC] Delete all .la files?

2016-01-04 Thread Burton, Ross
On 23 December 2015 at 21:41, Burton, Ross wrote: > So in the new year I plan on submitting a renamed version of this class to > oe-core and adding it to INHERIT_DISTRO. Any comments? > Technicalities time: should this be a new class that is in the default

Re: [OE-core] [oe] [RFC] Delete all .la files?

2016-01-04 Thread Christopher Larson
On Mon, Jan 4, 2016 at 10:28 AM, Burton, Ross wrote: > On 23 December 2015 at 21:41, Burton, Ross wrote: > > > So in the new year I plan on submitting a renamed version of this class > to > > oe-core and adding it to INHERIT_DISTRO. Any comments? >

Re: [OE-core] [RFC] Delete all .la files?

2016-01-04 Thread Burton, Ross
On 4 January 2016 at 08:48, Clemens Lang wrote: > Note that any software using libltdl will still require the .la files > and must thus opt-out of .la file deletion. ImageMagick is probably the > most common occurrence of this. > The use of modules in imagemagick is

Re: [OE-core] [PATCH][master][RESEND 00/15] ARM tune fixes and improvements

2016-01-04 Thread Burton, Ross
On 23 December 2015 at 10:10, Martin Jansa wrote: > Ping, I've rebased this again. > Merged to mut, will hit the AB with it tonight. Ross -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org

Re: [OE-core] [PATCH] jpeg: To enable non-JPEG file formats for djpeg/cjpeg command.

2016-01-04 Thread Burton, Ross
Hi, oe-core is about to move to libjpeg-turbo (see ross/mut and the recent patches), so this will need to be retested and rebased if required. Ross On 30 December 2015 at 01:07, Lei, Maohui wrote: > ping > > > -Original Message- > > From: Lei, Maohui > >

Re: [OE-core] [RFC] Mark of upstream CVE patches

2016-01-04 Thread Mariano Lopez
On 12/16/2015 03:21 AM, Burton, Ross wrote: On 16 December 2015 at 09:03, Sona Sarmadi > wrote: We are supposed to have reference to the CVE identifier both in the patch file/s and the commit message(e.g. xxx-

[OE-core] [PATCH v3 0/3] ptest-runner 2.0

2016-01-04 Thread Aníbal Limón
The whole set is sent to two ML for reviewing purposes the first two patches are for oe-core and the last one for poky. The first two commits (oe-core) adds a new ptest-runner written in python the sh one is conserved to use in tiny systems. What's new in ptest runner: -

[OE-core] [PATCH v3 2/3] ptest-runner: Add a recipe for install ptest-runner 2.0.

2016-01-04 Thread Aníbal Limón
[YOCTO #8021] Signed-off-by: Aníbal Limón --- .../ptest-runner/ptest-runner_2.0.bb | 27 ++ 1 file changed, 27 insertions(+) create mode 100644 meta/recipes-support/ptest-runner/ptest-runner_2.0.bb diff --git

[OE-core] [PATCH v3 1/3] ptest-runner: Add version 2.0 re-implementation in python.

2016-01-04 Thread Aníbal Limón
The new ptest-runner supports timeout of upstream tests executed, it looks for stdout of process and if no information is available in certain time (defaults to 5m) the process is treaty as blocked and ptest-runner kills it, this handles problems of ptest-runner being blocked indefinitly for

[OE-core] [PATCH v3 3/3] conf/distro/poky-tiny.conf: Add default install of ptest-runner 1.0

2016-01-04 Thread Aníbal Limón
ptest-runner 2.0 depends on python that is too big for poky tiny distro, so install the ptest-runner 1.0 that only depends on shell. Signed-off-by: Aníbal Limón --- meta-yocto/conf/distro/poky-tiny.conf | 4 1 file changed, 4 insertions(+) diff --git