jeans/motioneyeos
jeans/motioneyeos
1
0
Fork 0
mirror of https://github.com/motioneye-project/motioneyeos.git synced 2025-08-02 16:07:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

package/lightning: fix install of lightning.h

Browse Source 
Fixes:
 - http://autobuild.buildroot.org/results/05ebc75598627d2a08e08e194f51cb8464f97b95

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
This commit is contained in:
Fabrice Fontaine 2019-10-10 20:50:45 +02:00 committed by Thomas Petazzoni
parent cff14017f9
commit 2c166c1939
2 changed files with 40 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
package/lightning/0001-include-Makefile.am-don-t-install-lightning.h-twice.patch Normal file
View File

@ -0,0 +1,38 @@
From 604c931bc673c507254a84c0f423c9ec8ce6e3a1 Mon Sep 17 00:00:00 2001
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Date: Thu, 10 Oct 2019 20:36:46 +0200
Subject: [PATCH] include/Makefile.am: don't install lightning.h twice
Commit 17164ed32d8f3530153b9cad67a4399c65f24512 added lightning.h to
nodist_include_HEADERS without removing it from include_HEADERS
This raises the following error on one of the buildroot autobuilders:
/usr/bin/install -c -m 644 lightning.h '/home/test/autobuild/run/instance-3/output-1/target/usr/include'
/usr/bin/install -c -m 644 lightning.h '/home/test/autobuild/run/instance-3/output-1/target/usr/include'
/usr/bin/install: cannot create regular file `/home/test/autobuild/run/instance-3/output-1/target/usr/include/lightning.h': File exists
Fix this by removing lightning.h from include_HEADERS
Fixes:
- http://autobuild.buildroot.org/results/05ebc75598627d2a08e08e194f51cb8464f97b95
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
include/Makefile.am | 1 -
1 file changed, 1 deletion(-)
diff --git a/include/Makefile.am b/include/Makefile.am
index e754dd3..8f91594 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -14,7 +14,6 @@
# License for more details.
#
-include_HEADERS = lightning.h
SUBDIRS = \
lightning
--
2.23.0

2
package/lightning/lightning.mk
View File

@ -9,6 +9,8 @@ LIGHTNING_SITE = $(BR2_GNU_MIRROR)/lightning
LIGHTNING_LICENSE = LGPL-3.0+ LIGHTNING_LICENSE = LGPL-3.0+
LIGHTNING_LICENSE_FILES = COPYING.LESSER LIGHTNING_LICENSE_FILES = COPYING.LESSER
LIGHTNING_INSTALL_STAGING = YES LIGHTNING_INSTALL_STAGING = YES
# We're patching include/Makefile.am
LIGHTNING_AUTORECONF = YES
ifeq ($(BR2_PACKAGE_LIGHTNING_DISASSEMBLER),y) ifeq ($(BR2_PACKAGE_LIGHTNING_DISASSEMBLER),y)
LIGHTNING_DEPENDENCIES += binutils zlib LIGHTNING_DEPENDENCIES += binutils zlib