mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-22 23:12:32 +00:00
1f11a4e283
Use postinst script to reload service instead of uci-defaults hack. It's possible thanks to recent base-files change that executes postinst after uci-defaults. This fixes support for uhttpd customizations. It's possible (again) to adjust uhttpd config with custom uci-defaults before it gets started. Cc: Hauke Mehrtens <hauke@hauke-m.de> Fixes:d25d281fd6("uhttpd: Reload config after uhttpd-mod-ubus was added") Ref:b799dd3c70("base-files: execute package's "postinst" after executing uci-defaults") Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
127 lines
3.1 KiB
Makefile
127 lines
3.1 KiB
Makefile
#
|
|
# Copyright (C) 2010-2015 Jo-Philipp Wich <jo@mein.io>
|
|
#
|
|
# This is free software, licensed under the GNU General Public License v2.
|
|
# See /LICENSE for more information.
|
|
#
|
|
|
|
include $(TOPDIR)/rules.mk
|
|
|
|
PKG_NAME:=uhttpd
|
|
PKG_RELEASE:=2
|
|
|
|
PKG_SOURCE_PROTO:=git
|
|
PKG_SOURCE_URL=$(PROJECT_GIT)/project/uhttpd.git
|
|
PKG_SOURCE_DATE:=2023-06-25
|
|
PKG_SOURCE_VERSION:=34a8a74dbdec3c0de38abc1b08f6a73c51263792
|
|
PKG_MIRROR_HASH:=8206885eebed5d1827763bcc5bcf9ca3510ae22b0ad1f6432114f1136c32dde2
|
|
PKG_MAINTAINER:=Felix Fietkau <nbd@nbd.name>
|
|
PKG_LICENSE:=ISC
|
|
|
|
PKG_ASLR_PIE_REGULAR:=1
|
|
PKG_BUILD_DEPENDS = ustream-ssl
|
|
|
|
include $(INCLUDE_DIR)/package.mk
|
|
include $(INCLUDE_DIR)/cmake.mk
|
|
include $(INCLUDE_DIR)/version.mk
|
|
|
|
define Package/uhttpd/default
|
|
SECTION:=net
|
|
CATEGORY:=Network
|
|
SUBMENU:=Web Servers/Proxies
|
|
TITLE:=uHTTPd - tiny, single threaded HTTP server
|
|
endef
|
|
|
|
define Package/uhttpd
|
|
$(Package/uhttpd/default)
|
|
DEPENDS:=+libubox +libblobmsg-json +libjson-script +libjson-c
|
|
endef
|
|
|
|
define Package/uhttpd/description
|
|
uHTTPd is a tiny single threaded HTTP server with TLS, CGI and Lua
|
|
support. It is intended as a drop-in replacement for the Busybox
|
|
HTTP daemon.
|
|
endef
|
|
|
|
define Package/uhttpd/conffiles
|
|
/etc/config/uhttpd
|
|
/etc/uhttpd.crt
|
|
/etc/uhttpd.key
|
|
endef
|
|
|
|
|
|
define Package/uhttpd-mod-lua
|
|
$(Package/uhttpd/default)
|
|
TITLE+= (Lua plugin)
|
|
DEPENDS:=uhttpd +liblua
|
|
endef
|
|
|
|
define Package/uhttpd-mod-lua/description
|
|
The Lua plugin adds a CGI-like Lua runtime interface to uHTTPd.
|
|
endef
|
|
|
|
|
|
define Package/uhttpd-mod-ubus
|
|
$(Package/uhttpd/default)
|
|
TITLE+= (ubus plugin)
|
|
DEPENDS:=uhttpd +libubus +libblobmsg-json
|
|
endef
|
|
|
|
define Package/uhttpd-mod-ubus/description
|
|
The ubus plugin adds a HTTP/JSON RPC proxy for ubus and publishes the
|
|
session.* namespace and procedures.
|
|
endef
|
|
|
|
|
|
define Package/uhttpd-mod-ucode
|
|
$(Package/uhttpd/default)
|
|
TITLE+= (ucode plugin)
|
|
DEPENDS:=uhttpd +libucode
|
|
endef
|
|
|
|
define Package/uhttpd-mod-ucode/description
|
|
The ucode plugin adds a CGI-like ucode runtime interface to uHTTPd.
|
|
endef
|
|
|
|
|
|
ifneq ($(CONFIG_USE_GLIBC),)
|
|
TARGET_CFLAGS += -D_DEFAULT_SOURCE
|
|
endif
|
|
|
|
define Package/uhttpd/install
|
|
$(INSTALL_DIR) $(1)/etc/init.d $(1)/etc/config $(1)/usr/sbin
|
|
$(INSTALL_BIN) ./files/uhttpd.init $(1)/etc/init.d/uhttpd
|
|
$(INSTALL_CONF) ./files/uhttpd.config $(1)/etc/config/uhttpd
|
|
$(VERSION_SED_SCRIPT) $(1)/etc/config/uhttpd
|
|
$(INSTALL_BIN) $(PKG_BUILD_DIR)/uhttpd $(1)/usr/sbin/uhttpd
|
|
endef
|
|
|
|
define Package/uhttpd-mod-lua/install
|
|
$(INSTALL_DIR) $(1)/usr/lib
|
|
$(INSTALL_BIN) $(PKG_BUILD_DIR)/uhttpd_lua.so $(1)/usr/lib/
|
|
endef
|
|
|
|
define Package/uhttpd-mod-ubus/install
|
|
$(INSTALL_DIR) $(1)/usr/lib $(1)/etc/uci-defaults
|
|
$(INSTALL_BIN) $(PKG_BUILD_DIR)/uhttpd_ubus.so $(1)/usr/lib/
|
|
$(INSTALL_DATA) ./files/ubus.default $(1)/etc/uci-defaults/00_uhttpd_ubus
|
|
endef
|
|
|
|
define Package/uhttpd-mod-ubus/postinst
|
|
#!/bin/sh
|
|
if [ -z "$${IPKG_INSTROOT}" ]; then
|
|
/etc/init.d/uhttpd reload
|
|
fi
|
|
endef
|
|
|
|
define Package/uhttpd-mod-ucode/install
|
|
$(INSTALL_DIR) $(1)/usr/lib
|
|
$(INSTALL_BIN) $(PKG_BUILD_DIR)/uhttpd_ucode.so $(1)/usr/lib/
|
|
endef
|
|
|
|
|
|
$(eval $(call BuildPackage,uhttpd))
|
|
$(eval $(call BuildPackage,uhttpd-mod-lua))
|
|
$(eval $(call BuildPackage,uhttpd-mod-ubus))
|
|
$(eval $(call BuildPackage,uhttpd-mod-ucode))
|