Skip to contentSkip to conversation

lib32-rsyslog: fix wrong systemd server file

PATCH New Kai Kang 1 participant 2 messages Dec 3, 2013

lore
Share & tools
lore

Kai Kang

author
#0 lore raw

PATCH 1/2 lib32-rsyslog: fix wrong systemd server file

When enable multilib on x86-64, it fails to build lib32-rsyslog with error:

| ERROR: Function failed: SYSTEMD_SERVICE_lib32-rsyslog value lib32-rsyslog.service does not exist

It uses wrong value ${PN}.service to set SYSTEMD_SERVICE. Correct it by using BPN.

---
 meta-oe/recipes-extended/rsyslog/rsyslog_7.4.4.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta-oe/recipes-extended/rsyslog/rsyslog_7.4.4.bb +1 -1
index 0101004..916d33e 100644
@@ -32,4 +32,4 @@ CONFFILES_${PN} = "${sysconfdir}/rsyslog.conf"
 RPROVIDES_${PN} += "${PN}-systemd"
 RREPLACES_${PN} += "${PN}-systemd"
 RCONFLICTS_${PN} += "${PN}-systemd"
-SYSTEMD_SERVICE_${PN} = "${PN}.service"
+SYSTEMD_SERVICE_${PN} = "${BPN}.service"
Signature · 1 line
1.8.1.2
author
#1 lore raw

PATCH 2/2 lua: add lua 5.2 recipe

Add lua 5.2.2 recipe.

Update:
* remove bitwise_operators.patch that lua uses bit32 library to support for bitwise operations.
* update uclibc-pthread.patch

---
 meta-oe/recipes-devtools/lua/lua/lua.pc            | 11 +++++
 .../recipes-devtools/lua/lua/uclibc-pthread.patch  | 13 ++++++
 meta-oe/recipes-devtools/lua/lua_5.2.2.bb          | 49 ++++++++++++++++++++++
 3 files changed, 73 insertions(+)
 create mode 100644 meta-oe/recipes-devtools/lua/lua/lua.pc
 create mode 100644 meta-oe/recipes-devtools/lua/lua/uclibc-pthread.patch
 create mode 100644 meta-oe/recipes-devtools/lua/lua_5.2.2.bb
meta-oe/recipes-devtools/lua/lua/lua.pc new file +11 -0
new file mode 100644
index 0000000..e6f8b6f
@@ -0,0 +1,11 @@
+prefix=/usr
+libdir=${prefix}/lib
+includedir=${prefix}/include
+
+Name: Lua
+Description: Lua language engine
+Version: 5.2.2
+Requires:
+Libs: -L${libdir} -llua
+Libs.private: -lm
+Cflags: -I${includedir}
meta-oe/recipes-devtools/lua/lua/uclibc-pthread.patch new file +13 -0
new file mode 100644
index 0000000..f4cdc5d
@@ -0,0 +1,13 @@
+Index: lua-5.1.4/src/Makefile                                                         
+===================================================================
+--- a/src/Makefile.orig	2013-10-22 22:17:19.929103523 -0400
++++ a/src/Makefile	2013-10-22 22:18:27.992104545 -0400
+@@ -9,7 +9,7 @@
+ CC= gcc
+ CFLAGS= -O2 -Wall -DLUA_COMPAT_ALL $(SYSCFLAGS) $(MYCFLAGS)
+ LDFLAGS= $(SYSLDFLAGS) $(MYLDFLAGS)
+-LIBS= -lm $(SYSLIBS) $(MYLIBS)
++LIBS= -lm -lpthread $(SYSLIBS) $(MYLIBS)
+ 
+ AR= ar rcu
+ RANLIB= ranlib
meta-oe/recipes-devtools/lua/lua_5.2.2.bb new file +49 -0

49 lines not on this page · raw message

Signature · 1 line
1.8.1.2