Skip to content
Snippets Groups Projects
Verified Commit 4c4fa019 authored by Josef Schlehofer's avatar Josef Schlehofer
Browse files

treewide: remove PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME) 

We are overwriting defaults. It is wrong as we didn't count with
variable ($PKG_VERSION). This means that if we didn't clean up
build_dir or dl folder, it will be extraced to smth without versioning.

- remove PKG_SOURCE_SUBDIR:=$(PKG_NAME) as well
- Add PKG_RELEASE if it was possible
parent 7cd5e948
1 merge request!327treewide: Makefile polishing
Hide whitespace changes
Inline Side-by-side
Showing
with 53 additions and 77 deletions
admin/cznic-cacert-bundle/Makefile
+ 5
− 5
View file @ 4c4fa019
......@@ -21,7 +21,7 @@ include $(INCLUDE_DIR)/package.mk
TURRIS_DEPS:=+cert-backup
define Package/$(PKG_NAME)/postinst
define Package/cznic-cacert-bundle/postinst
#!/bin/sh
[ -n "$$IPKG_INSTROOT" ] || {
......@@ -37,8 +37,8 @@ define Package/$(PKG_NAME)/postinst
}
endef
define Package/$(PKG_NAME)
TITLE:=$(PKG_NAME)
define Package/cznic-cacert-bundle
TITLE:=CZNIC cacert bundle
DEPENDS:=+cert-backup +c-rehash
endef
......@@ -48,7 +48,7 @@ define Build/Compile
true
endef
define Package/$(PKG_NAME)/install
define Package/cznic-cacert-bundle/install
$(INSTALL_DIR) $(1)/etc/ssl/
# TODO: If anything is modified here, it needs to be updated in the postinst too
$(INSTALL_DATA) $(PKG_BUILD_DIR)/cacerts/emergency-ca/ca.crt $(1)/etc/ssl/turris.pem
......@@ -62,4 +62,4 @@ define Package/$(PKG_NAME)/install
$(INSTALL_DATA) ./files/get-crl.cron $(1)/etc/cron.d/get-api
endef
$(eval $(call BuildPackage,$(PKG_NAME)))
$(eval $(call BuildPackage,cznic-cacert-bundle))
collect/pakon-dev-detect/Makefile
+ 4
− 9
View file @ 4c4fa019
......@@ -17,15 +17,10 @@ define Package/pakon-dev-detect
DEPENDS:=+pakon
endef
define Build/Compile
true
endef
define Package/pakon-dev-detect/install
true
endef
Build/Compile:=:
Build/Install:=:
define Package/$(PKG_NAME)/postinst
define Package/pakon-dev-detect/postinst
#!/bin/sh
[ -n "$$IPKG_INSTROOT" ] || {
/sbin/uci -q set pakon.monitor.notify_new_devices=1
......@@ -34,7 +29,7 @@ define Package/$(PKG_NAME)/postinst
}
endef
define Package/$(PKG_NAME)/prerm
define Package/pakon-dev-detect/prerm
#!/bin/sh
[ -n "$$IPKG_INSTROOT" ] || {
/sbin/uci -q set pakon.monitor.notify_new_devices=0
......
collect/pakon-lists/Makefile
+ 3
− 7
View file @ 4c4fa019
......@@ -15,19 +15,15 @@ PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=https://gitlab.labs.nic.cz/turris/pakon-light-lists.git
PKG_SOURCE_VERSION:=a0afbc6604d55915b7246ac7e15bd65757b0f57f
PKG_MAINTAINER:=CZ.NIC <packaging@turris.cz>
include $(INCLUDE_DIR)/package.mk
define Package/pakon-lists
TITLE:=$(PKG_NAME)
TITLE:=Pakon lists
endef
define Build/Compile
true
endef
Build/Compile:=:
define Package/pakon-lists/install
$(INSTALL_DIR) $(1)/usr/share/pakon-light/domains_ignore/
......@@ -50,4 +46,4 @@ define Package/pakon-lists/postinst
}
endef
$(eval $(call BuildPackage,$(PKG_NAME)))
$(eval $(call BuildPackage,pakon-lists))
collect/pakon/Makefile
+ 4
− 4
View file @ 4c4fa019
......@@ -31,7 +31,7 @@ define Package/pakon
DEPENDS:=+suricata-pakon +xz +python3-light +python3-logging +python3-ctypes +python3-cachetools +python3-sqlite3 +sqlite3-cli +pakon-lists +ouidb +suricata-conntrack-flows
endef
define Package/$(PKG_NAME)/description
define Package/pakon/description
Simple daemon that is able to collect events from suricata, store them locally to SQLite DB.
endef
......@@ -43,11 +43,11 @@ define Build/Install
true
endef
define Package/$(PKG_NAME)/conffiles
define Package/pakon/conffiles
/etc/config/pakon
endef
define Package/$(PKG_NAME)/install
define Package/pakon/install
$(INSTALL_DIR) $(1)/etc/suricata-pakon/output_conf.d
$(INSTALL_DATA) ./files/pakon-output.yaml $(1)/etc/suricata-pakon/output_conf.d/pakon.yaml
$(INSTALL_DIR) $(1)/etc/init.d
......@@ -94,4 +94,4 @@ define Package/pakon/prerm
/etc/init.d/pakon-handler stop
endef
$(eval $(call BuildPackage,$(PKG_NAME)))
$(eval $(call BuildPackage,pakon))
collect/sentinel/sentinel-certgen/Makefile
+ 0
− 1
View file @ 4c4fa019
......@@ -15,7 +15,6 @@ PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=https://gitlab.labs.nic.cz/turris/sentinel/certgen.git
PKG_SOURCE_VERSION:=v$(PKG_VERSION)
PKG_MAINTAINER:=CZ.NIC <packaging@turris.cz>
PKG_LICENSE:=GPL-3.0-or-later
PKG_LICENSE_FILES:=LICENSE.md
......
collect/sentinel/sentinel-dynfw-client/Makefile
+ 0
− 1
View file @ 4c4fa019
......@@ -15,7 +15,6 @@ PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=https://gitlab.labs.nic.cz/turris/sentinel/dynfw-client.git
PKG_SOURCE_VERSION:=v$(PKG_VERSION)
PKG_MAINTAINER:=CZ.NIC <packaging@turris.cz>
PKG_LICENSE:=GPL-3.0-or-later
......
collect/sentinel/sentinel-minipot/Makefile
+ 0
− 1
View file @ 4c4fa019
......@@ -14,7 +14,6 @@ PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=https://gitlab.labs.nic.cz/turris/sentinel/minipot.git
PKG_SOURCE_VERSION:=ebc6c8f96202b6c122fcc8f94b9413ec6bfd2e4f
PKG_MAINTAINER:=CZ.NIC <packaging@turris.cz>
PKG_LICENSE:=GPL-3.0-or-later
......
collect/sentinel/sentinel-nikola/Makefile
+ 0
− 1
View file @ 4c4fa019
......@@ -15,7 +15,6 @@ PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=https://gitlab.labs.nic.cz/turris/sentinel/nikola.git
PKG_SOURCE_VERSION:=v$(PKG_VERSION)
PKG_MAINTAINER:=CZ.NIC <packaging@turris.cz>
PKG_LICENSE:=GPL-3.0-or-later
PKG_LICENSE_FILES:=LICENSE.txt
......
collect/sentinel/sentinel-proxy/Makefile
+ 1
− 2
View file @ 4c4fa019
......@@ -15,9 +15,8 @@ PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=https://gitlab.labs.nic.cz/turris/sentinel/proxy.git
PKG_SOURCE_VERSION:=v$(PKG_VERSION)
PKG_MAINTAINER:=CZ.NIC <packaging@turris.cz>
PKG_LICENSE:=GPL-3.0
PKG_LICENSE:=GPL-3.0-or-later
PKG_FIXUP:=autoreconf
......
collect/sentinel/turris-survey/Makefile
+ 1
− 2
View file @ 4c4fa019
......@@ -15,9 +15,8 @@ PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=https://gitlab.labs.nic.cz/turris/sentinel/turris-survey.git
PKG_SOURCE_VERSION:=v$(PKG_VERSION)
PKG_MAINTAINER:=CZ.NIC <packaging@turris.cz>
PKG_LICENSE:=GPL-3.0-or-later
PKG_LICENSE:=GPL-3.0-or-later
PKG_LICENSE_FILES:=LICENSE.txt
include $(INCLUDE_DIR)/package.mk
......
collect/suricata-conntrack-flows/Makefile
+ 5
− 10
View file @ 4c4fa019
......@@ -33,24 +33,19 @@ define Package/suricata-conntrack-flows/description
Helper script to track flows bypassed by suricata.
endef
define Build/Compile
true
endef
define Build/Install
true
endef
Build/Compile:=:
Build/Install:=:
define Package/$(PKG_NAME)/install
define Package/suricata-conntrack-flows/install
$(INSTALL_DIR) $(1)/usr/libexec
$(INSTALL_BIN) $(PKG_BUILD_DIR)/suricata_conntrack_flows.py $(1)/usr/libexec/
endef
define Package/suricata/postinst
define Package/suricata-conntrack-flows/postinst
#!/bin/sh
[ -n "$$IPKG_INSTROOT" ] || {
grep "max_dgram_qlen" /etc/sysctl.conf || printf "\nnet.unix.max_dgram_qlen=100" >> /etc/sysctl.conf
}
endef
$(eval $(call BuildPackage,$(PKG_NAME)))
$(eval $(call BuildPackage,suricata-conntrack-flows))
hardware/atsha204/getmac/Makefile
+ 4
− 4
View file @ 4c4fa019
#
## Copyright (C) 2014 CZ.NIC z.s.p.o. (http://www.nic.cz/)
## Copyright (C) 2014-2020 CZ.NIC z.s.p.o. (https://www.nic.cz/)
#
## This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
......@@ -9,13 +9,13 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=getmac
PKG_VERSION:=1
PKG_RELEASE:=1
PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=https://gitlab.labs.nic.cz/turris/misc.git
PKG_SOURCE_VERSION:=5b243eee1e4d5769dfb8260335118ec626849e3b
PKG_SOURCE_SUBDIR:=$(PKG_NAME)
PKG_MAINTAINER:=Robin Obůrka <robin.oburka@nic.cz>
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)
PKG_MAINTAINER:=CZ.NIC <packaging@turris.cz>
include $(INCLUDE_DIR)/package.mk
......
hardware/atsha204/update_mac/Makefile
+ 4
− 4
View file @ 4c4fa019
......@@ -9,9 +9,9 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=update_mac
PKG_VERSION:=2
PKG_SOURCE_SUBDIR:=$(PKG_NAME)
PKG_RELEASE:=1
PKG_MAINTAINER:=CZ.NIC <packaging@turris.cz>
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)
include $(INCLUDE_DIR)/package.mk
......@@ -22,9 +22,9 @@ endef
Build/Compile:=
define Package/$(PKG_NAME)/install
define Package/update_mac/install
$(INSTALL_DIR) $(1)/etc/init.d
$(INSTALL_BIN) ./files/update_mac $(1)/etc/init.d/update_mac
endef
$(eval $(call BuildPackage,$(PKG_NAME)))
$(eval $(call BuildPackage,update_mac))
hardware/mox/watchdog_adjust/Makefile
+ 3
− 3
View file @ 4c4fa019
......@@ -9,9 +9,9 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=watchdog_adjust
PKG_VERSION:=6
PKG_SOURCE_SUBDIR:=$(PKG_NAME)
PKG_RELEASE:=1
PKG_MAINTAINER:=CZ.NIC <packaging@turris.cz>
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)
include $(INCLUDE_DIR)/package.mk
......@@ -36,4 +36,4 @@ define Package/$(PKG_NAME)/install
$(INSTALL_BIN) ./files/etc/init.d/watchdog_adjust $(1)/etc/init.d/watchdog_adjust
endef
$(eval $(call BuildPackage,$(PKG_NAME)))
$(eval $(call BuildPackage,watchdog_adjust))
hardware/nor-update/Makefile
+ 2
− 1
View file @ 4c4fa019
......@@ -9,8 +9,9 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=nor-update
PKG_VERSION:=6
PKG_RELEASE:=1
PKG_MAINTAINER:=CZ.NIC <packaging@turris.cz>
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)
include $(INCLUDE_DIR)/package.mk
......
hardware/turris1x/smrt-image/Makefile
+ 1
− 1
View file @ 4c4fa019
......@@ -32,4 +32,4 @@ define Package/$(PKG_NAME)/install
$(INSTALL_DATA) $(PKG_BUILD_DIR)/smrt.firmware $(1)/usr/share/smrt/firmware
endef
$(eval $(call BuildPackage,$(PKG_NAME)))
$(eval $(call BuildPackage,smrt-image))
hardware/turris1x/smrt/Makefile
+ 5
− 6
View file @ 4c4fa019
......@@ -9,13 +9,12 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=smrt
PKG_VERSION:=15
PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=https://gitlab.labs.nic.cz/turris/smrt.git
PKG_SOURCE_VERSION:=d3f4a37a88207beb41e01d2e77cc7dfa6b7edd8b
PKG_SOURCE_SUBDIR:=$(PKG_NAME)
PKG_MAINTAINER:=CZ.NIC <packaging@turris.cz>
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)
include $(INCLUDE_DIR)/package.mk
......@@ -28,11 +27,11 @@ define Build/Compile
$(MAKE_VARS) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) NO_DOC=1
endef
define Package/$(PKG_NAME)/conffiles
define Package/smrt/conffiles
/etc/config/smrtd
endef
define Package/$(PKG_NAME)/install
define Package/smrt/install
$(INSTALL_DIR) $(1)/usr/bin
$(INSTALL_BIN) $(PKG_BUILD_DIR)/bin/smrtd $(1)/usr/bin/
......@@ -43,7 +42,7 @@ define Package/$(PKG_NAME)/install
$(INSTALL_CONF) ./files/smrtd.config $(1)/etc/config/smrtd
endef
define Package/$(PKG_NAME)/postinst
define Package/smrt/postinst
#!/bin/sh
set -x
[ -n "$$IPKG_INSTROOT" ] || {
......@@ -52,4 +51,4 @@ set -x
}
endef
$(eval $(call BuildPackage,$(PKG_NAME)))
$(eval $(call BuildPackage,smrt))
multimedia/tvheadend-cz-dvb-t2/Makefile
+ 5
− 6
View file @ 4c4fa019
......@@ -12,7 +12,6 @@ PKG_VERSION:=1
PKG_RELEASE:=1
PKG_MAINTAINER:=CZ.NIC <packaging@turris.cz>
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)
include $(INCLUDE_DIR)/package.mk
......@@ -21,7 +20,7 @@ define Package/$(PKG_NAME)
DEPENDS:=+tvheadend
endef
define Package/$(PKG_NAME)/description
define Package/tvheadend-cz-dvt-t2/description
Experimental mux definition for Czech DVB-T2
endef
......@@ -29,12 +28,12 @@ define Build/Compile
true
endef
define Package/$(PKG_NAME)/install
define Package/tvheadend-cz-dvt-t2/install
$(INSTALL_DIR) $(1)/usr/share/tvheadend/data/dvb-scan/dvb-t
$(INSTALL_DATA) files/cz-dvb-T2 $(1)/usr/share/tvheadend/data/dvb-scan/dvb-t/cz-dvb-T2
endef
define Package/$(PKG_NAME)/postinst
define Package/tvheadend-cz-dvt-t2/postinst
#!/bin/sh
set -x
[ -n "$$IPKG_INSTROOT" ] || {
......@@ -42,7 +41,7 @@ set -x
}
endef
define Package/$(PKG_NAME)/postrm
define Package/tvheadend-cz-dvt-t2/postrm
#!/bin/sh
set -x
[ -n "$$IPKG_INSTROOT" ] || {
......@@ -50,4 +49,4 @@ set -x
}
endef
$(eval $(call BuildPackage,$(PKG_NAME)))
$(eval $(call BuildPackage,tvheadend-cz-dvt-t2))
net/dnssec-rootkey/Makefile
+ 2
− 4
View file @ 4c4fa019
......@@ -11,8 +11,6 @@ PKG_NAME:=dnssec-rootkey
PKG_VERSION:=0.0.2
PKG_RELEASE:=1
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)
PKG_MAINTAINER:=Jan Pavlinec <jan.pavlinec@nic.cz>
PKG_LICENSE:=GPL-3.0
......@@ -33,14 +31,14 @@ set -ex
}
endef
define Package/$(PKG_NAME)/description
define Package/dnssec-rootkey/description
Root key for DNSSEC resolver
endef
define Build/Compile
endef
define Package/$(PKG_NAME)/install
define Package/dnssec-rootkey/install
$(INSTALL_DIR) $(1)/etc/
$(INSTALL_CONF) ./files/root.keys $(1)/etc/root.keys
$(INSTALL_DIR) $(1)/usr/bin/
......
net/lighttpd-https-cert/Makefile
+ 4
− 5
View file @ 4c4fa019
......@@ -10,7 +10,6 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=lighttpd-https-cert
PKG_VERSION:=5
PKG_RELEASE:=2
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)
PKG_MAINTAINER:=CZ.NIC <packaging@turris.cz>
PKG_LICENSE:=GPL-3.0
......@@ -26,12 +25,12 @@ define Build/Compile
true
endef
define Package/$(PKG_NAME)/install
define Package/lighttpd-https-cert/install
$(INSTALL_DIR) $(1)/etc/lighttpd/conf.d/
$(INSTALL_CONF) ./files/ssl-enable.conf $(1)/etc/lighttpd/conf.d/ssl-enable.conf
endef
define Package/$(PKG_NAME)/postinst
define Package/lighttpd-https-cert/postinst
#!/bin/sh
if [ -z "$$IPKG_INSTROOT" ]; then
[ -f /etc/lighttpd-self-signed.pem ] || openssl req -new -x509 -keyout /etc/lighttpd-self-signed.pem -out /etc/lighttpd-self-signed.pem -days 7300 -nodes -subj "/C=CZ/ST=Prague/L=Prague/O=Turris"
......@@ -45,9 +44,9 @@ else
fi
endef
define Package/$(PKG_NAME)/postrm
define Package/lighttpd-https-cert/postrm
#!/bin/sh
/etc/init.d/lighttpd restart
endef
$(eval $(call BuildPackage,$(PKG_NAME)))
$(eval $(call BuildPackage,lighttpd-https-cert))
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment