ootoc: sync with upstream source

This commit is contained in:
CN_SZTL 2020-03-12 23:35:34 +08:00
parent 16a5807afa
commit da9b531176
No known key found for this signature in database
GPG Key ID: 6850B6345C862176
3 changed files with 5345 additions and 22 deletions

View File

@ -15,8 +15,8 @@ PKG_RELEASE:=2
PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=https://github.com/ElonH/ootoc.git
PKG_MIRROR_HASH:=8a26f160c3314bde554e4094ba7f24376403a152bd8e796367f6807f365b792d
PKG_SOURCE_VERSION:=6bfbe253e8265c7aa7d5553e4dc4c752d5c23ac3
PKG_MIRROR_HASH:=b7ec508df4e204bdf12fa679075b1d36c8527ef5f8656415eac1aca31227a44b
PKG_SOURCE_VERSION:=5b919a6c6da5c5c0c007b2820c70a86aa3067aca
PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
@ -38,29 +38,16 @@ CMAKE_OPTIONS+= -DOOTOC_TEST:BOOL=OFF -DOOTOC_BUILDIN_LIBTAR:BOOL=OFF
define Package/ootoc
SECTION:=base
CATEGORY:=Base system
URL:=https://github.com/msgpack/ootoc
TITLE:=opkg over tar over curl
DEPENDS:=+libootoc
MENU:=1
endef
define Package/libootoc
URL:=https://github.com/msgpack/ootoc
TITLE:=opkg over tar over curl
DEPENDS:=+libcurl +libyaml-cpp +libtar
SECTION:=lib
CATEGORY:=Libraries
VARIANT:=lib
MENU:=1
endef
define Package/ootoc/description
opkg over tar over curl
endef
define Package/libootocc/description
$(call Package/ootoc/description)
endef
define Build/InstallDev
$(INSTALL_DIR) $(1)/usr/lib $(1)/usr/include $(1)/usr/share
$(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib
@ -69,11 +56,11 @@ define Build/InstallDev
endef
define Package/ootoc/install
$(INSTALL_DIR) $(1)/usr/bin $(1)/etc/init.d $(1)/etc/config
$(INSTALL_DIR) $(1)/usr/bin $(1)/etc/init.d $(1)/etc/config $(1)/var/etc/ootoc
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/ootocCLI $(1)/usr/bin/
$(INSTALL_BIN) ./files/ootoc.init $(1)/etc/init.d/ootoc
$(INSTALL_DATA) ./files/ootoc.conf $(1)/etc/config/ootoc
$(INSTALL_DATA) ./files/latest-Packages.yml $(1)/var/etc/ootoc/latest-Packages.yml
endef
$(eval $(call BuildPackage,ootoc))
$(eval $(call BuildPackage,libootoc))

File diff suppressed because it is too large Load Diff

View File

@ -1,7 +1,7 @@
#!/bin/bash /etc/rc.common
START=55
STOP=55
START=83
STOP=83
USE_PROCD=1
PROG=/usr/bin/ootocCLI
@ -33,7 +33,7 @@ init_conf() {
FEEDS_BAK="${FEEDS}.bak"
[ -d "${FEEDS%/*}" ] || mkdir -p "${FEEDS%/*}" 2>/dev/null
[ -e "$FEEDS_BAK" ] || {
_log "opkg feeds backup not exist '$FEEDS_BAK', backup now..."
_err "opkg feeds backup not exist '$FEEDS_BAK', backup now..."
[ -e "$FEEDS" ] || {
_err "not exist file: $FEEDS"
return 1
@ -43,6 +43,14 @@ init_conf() {
# create log path
[ -d "${LOG%/*}" ] || mkdir -p "${LOG%/*}" 2>/dev/null
# disable signature
[ -e /etc/opkg.conf ] || {
_err "not exist file: /etc/opkg.conf"
return 1
}
sed -i "s/^[ ]*option check_signature/# option check_signaturesign/" /etc/opkg.conf
return 0
}
start_service() {
@ -63,7 +71,7 @@ start_service() {
return 1
}
$PROG subscription --addr "$ADDR" --port "$PORT" --url "$TAR" --aux "$AUX" --out "/etc/opkg/distfeeds.conf" >/dev/null
$PROG subscription --addr "$ADDR" --port "$PORT" -i "$AUX" > "/etc/opkg/distfeeds.conf"
procd_open_instance
procd_set_param command $PROG server