Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #5295 from wvdakker/reorder

Browse source 
Shorewall(6)-lite: Reorder install section
This commit is contained in:
Hannu Nyman 2017-12-18 16:03:43 +02:00 committed by GitHub
commit 8a79f6f2b2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
net/shorewall-lite/Makefile
View file

@ -14,7 +14,7 @@ PKG_BUGFIX_MAJOR_VERSION:=9
PKG_BUGFIX_MINOR_VERSION:=
PKG_VERSION:=$(PKG_MAJOR_MINOR_VERSION).$(PKG_BUGFIX_MAJOR_VERSION)$(PKG_BUGFIX_MINOR_VERSION)
PKG_DIRECTORY:=$(PKG_MAJOR_MINOR_VERSION).$(PKG_BUGFIX_MAJOR_VERSION)
PKG_RELEASE:=2
PKG_RELEASE:=3
PKG_SOURCE_URL:=http://www.shorewall.net/pub/shorewall/$(PKG_MAJOR_MINOR_VERSION)/shorewall-$(PKG_DIRECTORY)/ \
http://www1.shorewall.net/pub/shorewall/$(PKG_MAJOR_MINOR_VERSION)/shorewall-$(PKG_DIRECTORY)/ \
@ -63,19 +63,19 @@ define Build/Compile
endef
define Package/shorewall-lite/install
$(INSTALL_DIR) $(1)/usr/sbin/
$(INSTALL_DIR) $(1)/etc/init.d/
$(INSTALL_DIR) $(1)/etc/hotplug.d/iface/
$(INSTALL_DIR) $(1)/etc/init.d/
$(INSTALL_DIR) $(1)/etc/shorewall-lite/state/
$(INSTALL_DIR) $(1)/usr/sbin/
$(INSTALL_DIR) $(1)/usr/share/shorewall-lite/
$(INSTALL_BIN) ./files/hotplug_iface $(1)/etc/hotplug.d/iface/05-shorewall-lite
$(CP) $(PKG_INSTALL_DIR)/etc/shorewall-lite/ $(1)/etc/
$(CP) $(PKG_INSTALL_DIR)/usr/share/shorewall-lite/ $(1)/usr/share/
$(CP) $(PKG_INSTALL_DIR)/usr/sbin/shorewall-lite $(1)/usr/sbin/
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/shorewall-lite/shorecap $(1)/usr/share/shorewall-lite/
$(INSTALL_BIN) ./files/hostname $(1)/usr/share/shorewall-lite/
$(CP) $(PKG_INSTALL_DIR)/etc/shorewall-lite/ $(1)/etc/
$(INSTALL_BIN) ./files/hotplug_iface $(1)/etc/hotplug.d/iface/05-shorewall-lite
$(INSTALL_BIN) ./files/shorewall-lite.init $(1)/etc/init.d/shorewall-lite
$(CP) ./files/vardir $(1)/etc/shorewall-lite/
$(INSTALL_BIN) ./files/vardir $(1)/etc/shorewall-lite/
endef
$(eval $(call BuildPackage,shorewall-lite))

12
net/shorewall6-lite/Makefile
View file

@ -14,7 +14,7 @@ PKG_BUGFIX_MAJOR_VERSION:=9
PKG_BUGFIX_MINOR_VERSION:=
PKG_VERSION:=$(PKG_MAJOR_MINOR_VERSION).$(PKG_BUGFIX_MAJOR_VERSION)$(PKG_BUGFIX_MINOR_VERSION)
PKG_DIRECTORY:=$(PKG_MAJOR_MINOR_VERSION).$(PKG_BUGFIX_MAJOR_VERSION)
PKG_RELEASE:=2
PKG_RELEASE:=3
PKG_SOURCE_URL:=http://www.shorewall.net/pub/shorewall/$(PKG_MAJOR_MINOR_VERSION)/shorewall-$(PKG_DIRECTORY)/ \
http://www1.shorewall.net/pub/shorewall/$(PKG_MAJOR_MINOR_VERSION)/shorewall-$(PKG_DIRECTORY)/ \
@ -64,19 +64,19 @@ define Build/Compile
endef
define Package/shorewall6-lite/install
$(INSTALL_DIR) $(1)/usr/sbin/
$(INSTALL_DIR) $(1)/etc/init.d/
$(INSTALL_DIR) $(1)/etc/hotplug.d/iface/
$(INSTALL_DIR) $(1)/etc/init.d/
$(INSTALL_DIR) $(1)/etc/shorewall6-lite/state/
$(INSTALL_DIR) $(1)/usr/sbin/
$(INSTALL_DIR) $(1)/usr/share/shorewall6-lite/
$(INSTALL_BIN) ./files/hotplug_iface $(1)/etc/hotplug.d/iface/05-shorewall6-lite
$(CP) $(PKG_INSTALL_DIR)/etc/shorewall6-lite/ $(1)/etc/
$(CP) $(PKG_INSTALL_DIR)/usr/share/shorewall6-lite/ $(1)/usr/share/
$(CP) $(PKG_INSTALL_DIR)/usr/sbin/shorewall6-lite $(1)/usr/sbin/
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/shorewall6-lite/shorecap $(1)/usr/share/shorewall6-lite/
$(INSTALL_BIN) ./files/hostname $(1)/usr/share/shorewall6-lite/
$(CP) $(PKG_INSTALL_DIR)/etc/shorewall6-lite/ $(1)/etc/
$(INSTALL_BIN) ./files/hotplug_iface $(1)/etc/hotplug.d/iface/05-shorewall6-lite
$(INSTALL_BIN) ./files/shorewall6-lite.init $(1)/etc/init.d/shorewall6-lite
$(CP) ./files/vardir $(1)/etc/shorewall6-lite/
$(INSTALL_BIN) ./files/vardir $(1)/etc/shorewall6-lite/
endef
$(eval $(call BuildPackage,shorewall6-lite))