Browse Source

add liborcania libyder and libulfius to image

Reinhard Russinger 7 years ago
parent
commit
d8dfb762eb

+ 3 - 0
Config.in

@@ -5,4 +5,7 @@ source "$BR2_EXTERNAL_GFA_Display001_PATH/package/libgfaipc/Config.in"
 source "$BR2_EXTERNAL_GFA_Display001_PATH/package/libgfatimer/Config.in"
 source "$BR2_EXTERNAL_GFA_Display001_PATH/package/libgfatimer/Config.in"
 source "$BR2_EXTERNAL_GFA_Display001_PATH/package/qmlplugins/Config.in"
 source "$BR2_EXTERNAL_GFA_Display001_PATH/package/qmlplugins/Config.in"
 source "$BR2_EXTERNAL_GFA_Display001_PATH/package/python-ufw/Config.in"
 source "$BR2_EXTERNAL_GFA_Display001_PATH/package/python-ufw/Config.in"
+source "$BR2_EXTERNAL_GFA_Display001_PATH/package/liborcania/Config.in"
+source "$BR2_EXTERNAL_GFA_Display001_PATH/package/libyder/Config.in"
+source "$BR2_EXTERNAL_GFA_Display001_PATH/package/libulfius/Config.in"
 
 

+ 1 - 0
configs/Display001_3.12.30_defconfig

@@ -437,3 +437,4 @@ BR2_PACKAGE_NETWORK_INTERFACES_SCRIPT=y
 BR2_PACKAGE_GFA_ADDONS=y
 BR2_PACKAGE_GFA_ADDONS=y
 BR2_PACKAGE_QMLPLUGINS=y
 BR2_PACKAGE_QMLPLUGINS=y
 BR2_PACKAGE_PYTHON_UFW=y
 BR2_PACKAGE_PYTHON_UFW=y
+BR2_PACKAGE_LIBULFIUS=y

+ 21 - 0
package/liborcania/0001-makefile.patch

@@ -0,0 +1,21 @@
+diff -pruN a/src/Makefile b/src/Makefile
+--- a/src/Makefile	2018-01-03 16:03:08.000000000 +0100
++++ b/src/Makefile	2018-01-17 11:19:54.387542091 +0100
+@@ -18,8 +18,7 @@
+ # You should have received a copy of the GNU General Public
+ # License along with this library.	If not, see <http://www.gnu.org/licenses/>.
+ #
+-PREFIX=/usr/local
+-CC=gcc
++PREFIX=/usr
+ CFLAGS=-c -fPIC -Wall -D_REENTRANT $(ADDITIONALFLAGS) $(JANSSONFLAG)
+ OUTPUT=liborcania.so
+ VERSION=1.1.1
+@@ -54,7 +53,6 @@ clean:
+ install: all
+ 	cp $(OUTPUT).$(VERSION) $(PREFIX)/lib
+ 	cp orcania.h $(PREFIX)/include
+-	-ldconfig
+ 
+ static-install: static
+ 	cp liborcania.a $(PREFIX)/lib

+ 5 - 0
package/liborcania/Config.in

@@ -0,0 +1,5 @@
+config BR2_PACKAGE_LIBORCANIA
+	bool "liborcania"
+	help
+		liborcania V 1.1.1
+

+ 23 - 0
package/liborcania/liborcania.mk

@@ -0,0 +1,23 @@
+LIBORCANIA_VERSION = 4b908eea87f59130ee672881e88ec4b9d5b49ccc
+INST_VERSION = 1.1.1
+LIBORCANIA_SITE = https://github.com/babelouest/orcania.git
+LIBORCANIA_SITE_METHOD = git
+LIBORCANIA_INSTALL_STAGING = YES
+LIBORCANIA_INSTALL_TARGET = YES
+
+define LIBORCANIA_BUILD_CMDS
+	$(MAKE) CC="$(TARGET_CC)" CXX="$(TARGET_CXX)" LD="$(TARGET_LD)" -C $(@D) all
+endef
+
+define LIBORCANIA_INSTALL_STAGING_CMDS
+	$(INSTALL) -D -m 0755 $(@D)/src/liborcania.so.$(INST_VERSION) $(STAGING_DIR)/usr/lib/liborcania.so.$(INST_VERSION)
+	cp -d $(@D)/src/liborcania.so $(STAGING_DIR)/usr/lib/liborcania.so
+	cp -d $(@D)/src/orcania.h $(STAGING_DIR)/usr/include
+endef
+
+define LIBORCANIA_INSTALL_TARGET_CMDS
+	$(INSTALL) -D -m 0755 $(@D)/src/liborcania.so.$(INST_VERSION) $(TARGET_DIR)/usr/lib/liborcania.so.$(INST_VERSION)
+	cp -d $(@D)/src/liborcania.so $(TARGET_DIR)/usr/lib/liborcania.so
+endef
+
+$(eval $(generic-package))

+ 35 - 0
package/libulfius/0001-makefile.patch

@@ -0,0 +1,35 @@
+Binärdateien a/src/libulfius.so und b/src/libulfius.so sind verschieden.
+Binärdateien a/src/libulfius.so.2.2.4 und b/src/libulfius.so.2.2.4 sind verschieden.
+diff -pruN a/src/Makefile b/src/Makefile
+--- a/src/Makefile	2018-01-16 23:17:38.000000000 +0100
++++ b/src/Makefile	2018-01-17 13:30:28.881587726 +0100
+@@ -19,12 +19,9 @@
+ # License along with this library.	If not, see <http://www.gnu.org/licenses/>.
+ #
+ 
+-LIBORCANIA_LOCATION=../lib/orcania/src
+-LIBYDER_LOCATION=../lib/yder/src
+-PREFIX=/usr/local
+-CC=gcc
+-CFLAGS=-c -pedantic -std=gnu99 -fPIC -Wall -D_REENTRANT -I$(PREFIX)/include -I$(LIBORCANIA_LOCATION) -I$(LIBYDER_LOCATION) $(ADDITIONALFLAGS) $(JANSSONFLAG) $(CURLFLAG) $(WEBSOCKETFLAG)
+-LIBS=-L$(PREFIX)/lib -L$(LIBORCANIA_LOCATION) -L$(LIBYDER_LOCATION) -lc -lmicrohttpd -lyder -lorcania -lpthread
++PREFIX=/usr
++CFLAGS=-c -pedantic -std=gnu99 -fPIC -Wall -D_REENTRANT $(ADDITIONALFLAGS) $(JANSSONFLAG) $(CURLFLAG) $(WEBSOCKETFLAG)
++LIBS=-L$(PREFIX)/lib -lc -lmicrohttpd -lyder -lorcania -lpthread
+ OUTPUT=libulfius.so
+ VERSION=2.2.4
+ 
+@@ -73,7 +70,6 @@ clean:
+ install: all
+ 	cp $(OUTPUT).$(VERSION) $(PREFIX)/lib
+ 	cp ulfius.h $(PREFIX)/include
+-	-ldconfig
+ 
+ static-install: static
+ 	cp libulfius.a $(PREFIX)/lib
+Binärdateien a/src/ulfius.o und b/src/ulfius.o sind verschieden.
+Binärdateien a/src/u_map.o und b/src/u_map.o sind verschieden.
+Binärdateien a/src/u_request.o und b/src/u_request.o sind verschieden.
+Binärdateien a/src/u_response.o und b/src/u_response.o sind verschieden.
+Binärdateien a/src/u_send_request.o und b/src/u_send_request.o sind verschieden.
+Binärdateien a/src/u_websocket.o und b/src/u_websocket.o sind verschieden.

+ 6 - 0
package/libulfius/Config.in

@@ -0,0 +1,6 @@
+config BR2_PACKAGE_LIBULFIUS
+	bool "libulfius"
+	select BR2_PACKAGE_LIBYDER
+	help
+		libulfius V 2.2.4
+

+ 23 - 0
package/libulfius/libulfius.mk

@@ -0,0 +1,23 @@
+LIBULFIUS_VERSION = fca4261026a9bfc1963a16eee2607883aa08bd27
+ULFIUS_INST_VERSION = 2.2.4
+LIBULFIUS_SITE = https://github.com/babelouest/ulfius.git
+LIBULFIUS_SITE_METHOD = git
+LIBULFIUS_INSTALL_STAGING = YES
+LIBULFIUS_INSTALL_TARGET = YES
+
+define LIBULFIUS_BUILD_CMDS
+	$(MAKE) CC="$(TARGET_CC)" CXX="$(TARGET_CXX)" LD="$(TARGET_LD)" -C $(@D) all
+endef
+
+define LIBULFIUS_INSTALL_STAGING_CMDS
+	$(INSTALL) -D -m 0755 $(@D)/src/libulfius.so.$(ULFIUS_INST_VERSION) $(STAGING_DIR)/usr/lib/libulfius.so.$(ULFIUS_INST_VERSION)
+	cp -d $(@D)/src/libulfius.so $(STAGING_DIR)/usr/lib/libulfius.so
+	cp -d $(@D)/src/ulfius.h $(STAGING_DIR)/usr/include
+endef
+
+define LIULFIUS_INSTALL_TARGET_CMDS
+	$(INSTALL) -D -m 0755 $(@D)/src/libulfius.so.$(ULFIUS_INST_VERSION) $(TARGET_DIR)/usr/lib/libulfius.so.$(ULFIUS_INST_VERSION)
+	cp -d $(@D)/src/libulfius.so $(TARGET_DIR)/usr/lib/libulfius.so
+endef
+
+$(eval $(generic-package))

+ 24 - 0
package/libyder/0001-makefile.patch

@@ -0,0 +1,24 @@
+Binärdateien a/src/libyder.so und b/src/libyder.so sind verschieden.
+Binärdateien a/src/libyder.so.1.1.1 und b/src/libyder.so.1.1.1 sind verschieden.
+diff -pruN a/src/Makefile b/src/Makefile
+--- a/src/Makefile	2018-01-16 22:41:22.000000000 +0100
++++ b/src/Makefile	2018-01-17 12:50:56.030845423 +0100
+@@ -18,8 +18,7 @@
+ # You should have received a copy of the GNU General Public
+ # License along with this library.	If not, see <http://www.gnu.org/licenses/>.
+ #
+-PREFIX=/usr/local
+-CC=gcc
++PREFIX=/usr
+ CFLAGS=-c -fPIC -Wall -D_REENTRANT $(ADDITIONALFLAGS)
+ LIBS=-lc -lorcania
+ OUTPUT=libyder.so
+@@ -43,7 +42,6 @@ clean:
+ install: all
+ 	cp $(OUTPUT).$(VERSION) $(PREFIX)/lib
+ 	cp yder.h $(PREFIX)/include
+-	-ldconfig
+ 
+ static-install: static
+ 	cp libyder.a $(PREFIX)/lib
+Binärdateien a/src/yder.o und b/src/yder.o sind verschieden.

+ 7 - 0
package/libyder/Config.in

@@ -0,0 +1,7 @@
+config BR2_PACKAGE_LIBYDER
+	bool "libyder"
+	select BR2_PACKAGE_LIBORCANIA
+	default y
+	help
+		liborcania component.config V 1.1.1
+

+ 23 - 0
package/libyder/libyder.mk

@@ -0,0 +1,23 @@
+LIBYDER_VERSION = fdcf30db62f1debdecf7fa6106de4883cdb0631c
+INST_VERSION = 1.1.1
+LIBYDER_SITE = https://github.com/babelouest/yder.git
+LIBYDER_SITE_METHOD = git
+LIBYDER_INSTALL_STAGING = YES
+LIBYDER_INSTALL_TARGET = YES
+
+define LIBYDER_BUILD_CMDS
+	$(MAKE) CC="$(TARGET_CC)" CXX="$(TARGET_CXX)" LD="$(TARGET_LD)" -C $(@D) all
+endef
+
+define LIBYDER_INSTALL_STAGING_CMDS
+	$(INSTALL) -D -m 0755 $(@D)/src/libyder.so.$(INST_VERSION) $(STAGING_DIR)/usr/lib/libyder.so.$(INST_VERSION)
+	cp -d $(@D)/src/libyder.so $(STAGING_DIR)/usr/lib/libyder.so
+	cp -d $(@D)/src/yder.h $(STAGING_DIR)/usr/include
+endef
+
+define LIBYDER_INSTALL_TARGET_CMDS
+	$(INSTALL) -D -m 0755 $(@D)/src/libyder.so.$(INST_VERSION) $(TARGET_DIR)/usr/lib/libyder.so.$(INST_VERSION)
+	cp -d $(@D)/src/libyder.so $(TARGET_DIR)/usr/lib/libyder.so
+endef
+
+$(eval $(generic-package))