[no ci] General: remove duplicate json-c package (#1167)

general/package/Config.in

@@ -47,7 +47,6 @@ source "$BR2_EXTERNAL_GENERAL_PATH/package/ingenic-osdrv-t31/Config.in"
 source "$BR2_EXTERNAL_GENERAL_PATH/package/ingenic-osdrv-t40/Config.in"
 source "$BR2_EXTERNAL_GENERAL_PATH/package/ingenic-pwm/Config.in"
 source "$BR2_EXTERNAL_GENERAL_PATH/package/ipctool/Config.in"
-source "$BR2_EXTERNAL_GENERAL_PATH/package/json-c-openipc/Config.in"
 source "$BR2_EXTERNAL_GENERAL_PATH/package/jsonfilter/Config.in"
 source "$BR2_EXTERNAL_GENERAL_PATH/package/lame-openipc/Config.in"
 source "$BR2_EXTERNAL_GENERAL_PATH/package/libcurl-openipc/Config.in"

general/package/json-c-openipc/Config.in

@@ -1,13 +0,0 @@
-config BR2_PACKAGE_JSON_C_OPENIPC
-	bool "json-c-openipc"
-	# uses __sync_val_compare_and_swap_4
-	depends on BR2_TOOLCHAIN_HAS_SYNC_4
-	help
-	  JSON-C - A JSON implementation in C
-
-	  JSON-C implements a reference counting object model that
-	  allows you to easily construct JSON objects in C, output
-	  them as JSON formatted strings and parse JSON formatted
-	  strings back into the C representation of JSON objects.
-
-	  https://github.com/json-c/json-c/

general/package/json-c-openipc/json-c-openipc.mk

@@ -1,21 +0,0 @@
-################################################################################
-#
-# json-c-openipc
-#
-################################################################################
-
-ifeq ($(LOCAL_DOWNLOAD),y)
-JSON_C_OPENIPC_SITE_METHOD = git
-JSON_C_OPENIPC_SITE = https://github.com/json-c/json-c
-JSON_C_OPENIPC_VERSION = $(shell git ls-remote $(JSON_C_OPENIPC_SITE) json-c-0.15-20200726 | head -1 | cut -f1)
-else
-JSON_C_OPENIPC_SITE = https://github.com/json-c/json-c/archive
-JSON_C_OPENIPC_SOURCE = json-c-0.15-20200726.tar.gz
-endif
-
-JSON_C_OPENIPC_INSTALL_STAGING = YES
-JSON_C_OPENIPC_LICENSE = MIT
-JSON_C_OPENIPC_LICENSE_FILES = COPYING
-
-$(eval $(cmake-package))
-$(eval $(host-cmake-package))

general/package/jsonfilter/Config.in

@@ -1,7 +1,7 @@
 config BR2_PACKAGE_JSONFILTER
 	bool "jsonfilter"
 	default n
-	select BR2_PACKAGE_JSON_C_OPENIPC
+	select BR2_PACKAGE_JSON_C
 	select BR2_PACKAGE_LIBUBOX
 	help
 	  jsonfilter - simple JSON parser

general/package/jsonfilter/jsonfilter.mk

@@ -14,10 +14,7 @@ JSONFILTER_SOURCE = master.tar.gz
 endif
 
 JSONFILTER_LICENSE = ISC, BSD-3-Clause
-
+JSONFILTER_DEPENDENCIES = json-c libubox
-JSONFILTER_DEPENDENCIES = \
-    $(if $(BR2_PACKAGE_JSON_C_OPENIPC),json-c-openipc) \
-    $(if $(BR2_PACKAGE_LIBUBOX),libubox)
 
 define JSONFILTER_INSTALL_TARGET_CMDS
     install -m 0755 -D $(@D)/jsonpath $(TARGET_DIR)/usr/bin/jsonfilter

general/package/majestic/majestic.mk

@@ -25,11 +25,11 @@ ifeq ($(MAJESTIC_RELEASE),lte)
 endif
 
 MAJESTIC_DEPENDENCIES = \
-	json-c-openipc \
 	libevent-openipc \
 	libogg-openipc \
 	mbedtls-openipc \
 	opus-openipc \
+	json-c \
 	zlib
 
 MAJESTIC_STRIP_COMPONENTS = 0

general/package/uqmi-openipc/Config.in

@@ -1,6 +1,6 @@
 config BR2_PACKAGE_UQMI_OPENIPC
 	bool "uqmi-openipc"
-	select BR2_PACKAGE_JSON_C_OPENIPC
+	select BR2_PACKAGE_JSON_C
 	select BR2_PACKAGE_LIBUBOX
 	help
 	  This command line tool originates from the OpenWrt project

general/package/uqmi-openipc/uqmi.mk

@@ -6,8 +6,9 @@
 
 UQMI_OPENIPC_VERSION = f254fc59c710d781eca3ec36e0bff2d8970370fa
 UQMI_OPENIPC_SITE = git://git.openwrt.org/project/uqmi.git
-UQMI_OPENIPC_DEPENDENCIES = json-c-openipc libubox
+
 UQMI_OPENIPC_LICENSE = LGPL-2.0+
 UQMI_OPENIPC_LICENSE_FILES = COPYING
+UQMI_OPENIPC_DEPENDENCIES = json-c libubox
 
 $(eval $(cmake-package))