projects
/
openwrt
/
openwrt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
package/*: update git urls for project repos
[openwrt/openwrt.git]
/
package
/
system
/
ubox
/
Makefile
diff --git
a/package/system/ubox/Makefile
b/package/system/ubox/Makefile
index a85a3c9ed10393de87363030d43d4eb170d97e9e..61a4653002759edc766b150d5dfff67c08ca160c 100644
(file)
--- a/
package/system/ubox/Makefile
+++ b/
package/system/ubox/Makefile
@@
-1,21
+1,20
@@
include $(TOPDIR)/rules.mk
PKG_NAME:=ubox
include $(TOPDIR)/rules.mk
PKG_NAME:=ubox
-PKG_VERSION:=201
5-07-14
+PKG_VERSION:=201
6-06-08
PKG_RELEASE=$(PKG_SOURCE_VERSION)
PKG_SOURCE_PROTO:=git
PKG_RELEASE=$(PKG_SOURCE_VERSION)
PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL
:=git://nbd.name/luci2
/ubox.git
+PKG_SOURCE_URL
=$(LEDE_GIT)/project
/ubox.git
PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=
907d046c8929fb74e5a3502a9498198695e62ad8
+PKG_SOURCE_VERSION:=
fd4bb41ee7ab136d25609c2a917beea5d52b723b
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
CMAKE_INSTALL:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
CMAKE_INSTALL:=1
-PKG_CHECK_FORMAT_SECURITY:=0
PKG_LICENSE:=GPL-2.0
PKG_LICENSE_FILES:=
PKG_LICENSE:=GPL-2.0
PKG_LICENSE_FILES:=
-PKG_MAINTAINER:=John Crispin <
blogic@openwrt
.org>
+PKG_MAINTAINER:=John Crispin <
john@phrozen
.org>
include $(INCLUDE_DIR)/package.mk
include $(INCLUDE_DIR)/cmake.mk
include $(INCLUDE_DIR)/package.mk
include $(INCLUDE_DIR)/cmake.mk
@@
-29,11
+28,17
@@
define Package/ubox
TITLE:=OpenWrt system helper toolbox
endef
TITLE:=OpenWrt system helper toolbox
endef
+define Package/logd
+ SECTION:=base
+ CATEGORY:=Base system
+ DEPENDS:=+libubox +libubus +libblobmsg-json +USE_GLIBC:librt
+ TITLE:=OpenWrt system log implementation
+endef
+
define Package/ubox/install
define Package/ubox/install
- $(INSTALL_DIR) $(1)/sbin $(1)/usr/sbin $(1)/lib/
$(1)/etc/init.d/
+ $(INSTALL_DIR) $(1)/sbin $(1)/usr/sbin $(1)/lib/
- $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/{kmodloader,logd,logread,validate_data} $(1)/sbin/
- $(INSTALL_BIN) ./files/log.init $(1)/etc/init.d/log
+ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/{kmodloader,validate_data} $(1)/sbin/
$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/libvalidate.so $(1)/lib
$(LN) ../../sbin/kmodloader $(1)/usr/sbin/rmmod
$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/libvalidate.so $(1)/lib
$(LN) ../../sbin/kmodloader $(1)/usr/sbin/rmmod
@@
-43,4
+48,12
@@
define Package/ubox/install
$(LN) ../../sbin/kmodloader $(1)/usr/sbin/modprobe
endef
$(LN) ../../sbin/kmodloader $(1)/usr/sbin/modprobe
endef
+define Package/logd/install
+ $(INSTALL_DIR) $(1)/sbin $(1)/etc/init.d/
+
+ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/{logd,logread} $(1)/sbin/
+ $(INSTALL_BIN) ./files/log.init $(1)/etc/init.d/log
+endef
+
$(eval $(call BuildPackage,ubox))
$(eval $(call BuildPackage,ubox))
+$(eval $(call BuildPackage,logd))