openwisp-config: fix Makefile for 1.1.0 #25186
Conversation
There was a problem hiding this comment.
@feckert we fixed some issues and updated some outdated code here.
|
Any maintainer could merge this please? @BKPepe |
| $(INSTALL_BIN) \ | ||
| $(PKG_BUILD_DIR)/openwisp-config/files/openwisp.agent \ | ||
| $(1)/usr/sbin/openwisp_config | ||
| $(1)/usr/sbin/openwisp-config | ||
|
|
||
| $(INSTALL_BIN) \ | ||
| $(PKG_BUILD_DIR)/openwisp-config/files/openwisp.init \ | ||
| $(1)/etc/init.d/openwisp_config | ||
| $(1)/etc/init.d/openwisp-config |
There was a problem hiding this comment.
While checking the commit description, this one is only valid, isnt it? :)
| $(PKG_BUILD_DIR)/openwisp-config/files/sbin/openwisp-get-random-number.lua \ | ||
| $(1)/usr/sbin/openwisp-get-random-number | ||
|
|
||
| $(CP) $(PKG_BUILD_DIR)/VERSION $(1)/usr/lib/openwisp-config/ |
There was a problem hiding this comment.
it's used by the program to read the version number
There was a problem hiding this comment.
I did not understand this commit.
admin/openwisp-config/Makefile
Outdated
| define Package/openwisp-config/postrm | ||
| #!/bin/sh | ||
| rm -f $${IPKG_INSTROOT}/usr/sbin/openwisp_config | ||
| endef |
There was a problem hiding this comment.
This will be removed automatically. No needed.
There was a problem hiding this comment.
The agent is now named /usr/sbin/openwisp-config, we create a symbolic link to /usr/sbin/openwisp_config for backward compatibility. This postrm hook removes the symbolic link. Was this clear?
There was a problem hiding this comment.
I know what you would like to achieve, but I am asking why do it in such complicated way.
admin/openwisp-config/Makefile
Outdated
| # for backward compatibility | ||
| define Package/openwisp-config/postinst | ||
| #!/bin/sh | ||
| if [ ! -L $${IPKG_INSTROOT}/usr/sbin/openwisp_config ]; then | ||
| ln -s /usr/sbin/openwisp-config $${IPKG_INSTROOT}/usr/sbin/openwisp_config | ||
| fi | ||
| endef |
There was a problem hiding this comment.
Also, this one, well, its breaking change introduced by previous version. Thus users will run this package by init script, right? I find this useless.
There was a problem hiding this comment.
Ok I guess we can remove it. Initially we copied the init script too but it caused to have multiple agents running.
Update configuration in Makefile to fix openwrt#25168 Signed-off-by: Gagan Deep <pandafy.dev@gmail.com>
pandafy
force-pushed
the
fix-openwisp-config-1.1
branch
from
0a9b79f
to
b3940fa
Compare
|
@BKPepe Do you have any comments or can I merge this? |
Update configuration in Makefile to fix #25168
Maintainer: @nemesifier
Compile tested: ramips
Run tested: ramips