| Message ID | B68AA701312B47E08D135DD8EDFAA4E6@ROLANDAMD64 |
|---|---|
| State | Accepted |
| Headers | show |
Dear Roland Franke, Thanks for the patch. However, it didn't apply properly, because you should use 'git send-email' instead of "Microsoft Windows Live Mail" to send your patches. When applying your patch, here is what happens: Applying patch #594313 using 'git am -s -3' Description: [1/1] package/owfs: Install owfs in staging directory Applying: package/owfs: Install owfs in staging directory fatal: corrupt patch at line 10 error: could not build fake ancestor Patch failed at 0001 package/owfs: Install owfs in staging directory The copy of the patch that failed is found in: .git/rebase-apply/patch When you have resolved this problem, run "git am --continue". If you prefer to skip this patch, run "git am --skip" instead. To restore the original branch and stop patching, run "git am --abort". On Tue, 8 Mar 2016 20:53:48 +0100, Roland Franke wrote: > Install package in staging directory, so that this package can be linked > together with other packages (By me with collectd and the onewire plugin) > > Signed-off-by: Roland Franke <fli4l at franke-prem.de> This " at " should have been "@" in the Signed-off-by line. That being said, I fixed up those issues locally and applied the patch. Please submit your collectd/onewire changes to make use of owfs. Thanks! Thomas
diff --git a/package/owfs/owfs.mk b/package/owfs/owfs.mk index 23167f4..083939a 100644 --- a/package/owfs/owfs.mk +++ b/package/owfs/owfs.mk @@ -15,6 +15,7 @@ OWFS_AUTORECONF = YES # owtcl license is declared in module/ownet/c/src/include/ow_functions.h OWFS_LICENSE = GPLv2+, LGPLv2 (owtcl) OWFS_LICENSE_FILES = COPYING COPYING.LIB +OWFS_INSTALL_STAGING = YES ifeq ($(BR2_PACKAGE_LIBFUSE),y) OWFS_DEPENDENCIES += libfuse
Install package in staging directory, so that this package can be linked together with other packages (By me with collectd and the onewire plugin) Signed-off-by: Roland Franke <fli4l at franke-prem.de> --- package/owfs/owfs.mk | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)