jeans/motioneyeos
jeans/motioneyeos
1
0
Fork 0
mirror of https://github.com/motioneye-project/motioneyeos.git synced 2025-07-31 15:07:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

package/iputils: rework to get rid of check-package warning

Browse Source 
check-package does not like us overriding IPUTILS_NINFOD, so rework the
logic to use unset (empty) for the positive case and explicitly test against
'n'.

package/iputils/iputils.mk:51: conditional override of variable IPUTILS_NINFOD
package/iputils/iputils.mk:56: conditional override of variable IPUTILS_NINFOD

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
Peter Korsgaard 2019-11-01 11:41:39 +01:00
parent 1fc8023b20
commit f8f4c01652
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
package/iputils/iputils.mk
View File

@ -31,8 +31,6 @@ else
IPUTILS_CONF_OPTS += -DUSE_IDN=false IPUTILS_CONF_OPTS += -DUSE_IDN=false
endif endif
IPUTILS_NINFOD = y
ifeq ($(BR2_PACKAGE_NETTLE),y) ifeq ($(BR2_PACKAGE_NETTLE),y)
IPUTILS_CONF_OPTS += -DUSE_CRYPTO=nettle IPUTILS_CONF_OPTS += -DUSE_CRYPTO=nettle
IPUTILS_DEPENDENCIES += nettle IPUTILS_DEPENDENCIES += nettle
@ -56,15 +54,15 @@ ifneq ($(BR2_TOOLCHAIN_HAS_THREADS),y)
IPUTILS_NINFOD = n IPUTILS_NINFOD = n
endif endif
ifeq ($(IPUTILS_NINFOD),y) ifeq ($(IPUTILS_NINFOD),n)
IPUTILS_CONF_OPTS += -DBUILD_NINFOD=false
else
IPUTILS_CONF_OPTS += -DBUILD_NINFOD=true IPUTILS_CONF_OPTS += -DBUILD_NINFOD=true
define IPUTILS_INSTALL_SERVICE_NINFOD define IPUTILS_INSTALL_SERVICE_NINFOD
mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants
ln -sf ../../../../lib/systemd/system/ninfod.service \ ln -sf ../../../../lib/systemd/system/ninfod.service \
$(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/ninfod.service $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/ninfod.service
endef endef
else
IPUTILS_CONF_OPTS += -DBUILD_NINFOD=false
endif endif
ifeq ($(BR2_SYSTEM_ENABLE_NLS),y) ifeq ($(BR2_SYSTEM_ENABLE_NLS),y)