mirror of
				https://github.com/Telecominfraproject/wlan-ap.git
				synced 2025-10-30 18:07:52 +00:00 
			
		
		
		
	protobuf: drop legacy out of tree package
Signed-off-by: John Crispin <john@phrozen.org>
This commit is contained in:
		| @@ -1,78 +1,6 @@ | |||||||
| # CONFIG_AHCI_IPQ is not set | CONFIG_ARCH_IPQ8074=y | ||||||
| CONFIG_ARCH_IPQ807x=y | CONFIG_ARCH_MMAP_RND_BITS=8 | ||||||
| # CONFIG_DIAGFWD_BRIDGE_CODE is not set |  | ||||||
| CONFIG_IPQ_ADSS_807x=y |  | ||||||
| CONFIG_IPQ_APSS_807x=y |  | ||||||
| CONFIG_IPQ_GCC_807x=y |  | ||||||
| CONFIG_NET_SWITCHDEV=y |  | ||||||
| CONFIG_NUM_ALT_PARTITION=16 |  | ||||||
| CONFIG_PINCTRL_IPQ807x=y |  | ||||||
| # CONFIG_IPC_LOGGING is not set |  | ||||||
| CONFIG_IPQ_SUBSYSTEM_DUMP=y |  | ||||||
| CONFIG_SPS=y |  | ||||||
| CONFIG_SPS_SUPPORT_NDP_BAM=y |  | ||||||
| CONFIG_CORESIGHT=y |  | ||||||
| CONFIG_CORESIGHT_CSR=y |  | ||||||
| CONFIG_CORESIGHT_CTI=y |  | ||||||
| CONFIG_CORESIGHT_EVENT=y |  | ||||||
| CONFIG_CORESIGHT_HWEVENT=y |  | ||||||
| CONFIG_CORESIGHT_LINKS_AND_SINKS=y |  | ||||||
| CONFIG_CORESIGHT_LINK_AND_SINK_TMC=y |  | ||||||
| CONFIG_CORESIGHT_QCOM_REPLICATOR=y |  | ||||||
| CONFIG_CORESIGHT_STREAM=m |  | ||||||
| # CONFIG_INPUT_PM8941_PWRKEY is not set |  | ||||||
| CONFIG_MDIO_QCA=y |  | ||||||
| # CONFIG_CRYPTO_ALL_CASES is not set |  | ||||||
| CONFIG_CRYPTO_DEV_QCOM_ICE=y |  | ||||||
| # CONFIG_CRYPTO_MANAGER_DISABLE_TESTS is not set |  | ||||||
| CONFIG_CRYPTO_SHA512=y |  | ||||||
| # CONFIG_CORESIGHT_QPDI is not set |  | ||||||
| # CONFIG_CORESIGHT_SINK_ETBV10 is not set |  | ||||||
| CONFIG_CORESIGHT_SINK_TPIU=y |  | ||||||
| # CONFIG_CORESIGHT_SOURCE_DUMMY is not set |  | ||||||
| CONFIG_CORESIGHT_SOURCE_ETM3X=y |  | ||||||
| CONFIG_CORESIGHT_SOURCE_ETM4X=y |  | ||||||
| # CONFIG_CORESIGHT_REMOTE_ETM is not set |  | ||||||
| CONFIG_CORESIGHT_STM=y |  | ||||||
| CONFIG_CORESIGHT_TPDA=y |  | ||||||
| CONFIG_CORESIGHT_TPDM=y |  | ||||||
| CONFIG_AQUANTIA_PHY=y |  | ||||||
| # CONFIG_CORESIGHT_TPDM_DEFAULT_ENABLE is not set |  | ||||||
| CONFIG_IIO=y |  | ||||||
| # CONFIG_IIO_BUFFER is not set |  | ||||||
| # CONFIG_IIO_TRIGGER is not set |  | ||||||
| CONFIG_PCIE_DW_PLAT=y | CONFIG_PCIE_DW_PLAT=y | ||||||
|  | # CONFIG_USB_QCOM_DIAG_BRIDGE is not set | ||||||
| CONFIG_VMSPLIT_2G=y | CONFIG_VMSPLIT_2G=y | ||||||
| # CONFIG_VMSPLIT_3G is not set | # CONFIG_VMSPLIT_3G is not set | ||||||
| CONFIG_PPS=y |  | ||||||
| CONFIG_PTP_1588_CLOCK=y |  | ||||||
| # CONFIG_DP83640_PHY is not set |  | ||||||
| CONFIG_PWM_IPQ4019=y |  | ||||||
| CONFIG_QCOM_APM=y |  | ||||||
| CONFIG_QCOM_DCC=y |  | ||||||
| # CONFIG_QCOM_SPMI_TEMP_ALARM is not set |  | ||||||
| CONFIG_QCOM_SPMI_VADC=y |  | ||||||
| CONFIG_REGMAP_ALLOW_WRITE_DEBUGFS=y |  | ||||||
| CONFIG_REGULATOR_CPR3=y |  | ||||||
| CONFIG_REGULATOR_CPR3_NPU=y |  | ||||||
| CONFIG_REGULATOR_CPR4_APSS=y |  | ||||||
| CONFIG_MMC_SDHCI_MSM_ICE=y |  | ||||||
| CONFIG_USB_BAM=y |  | ||||||
| CONFIG_USB_QCOM_KS_BRIDGE=m |  | ||||||
| CONFIG_MAILBOX=y |  | ||||||
| # CONFIG_USB_QCOM_DIAG_BRIDGE is not set |  | ||||||
| # CONFIG_USB_CONFIGFS_F_DIAG is not set |  | ||||||
| # CONFIG_NF_IPV6_DUMMY_HEADER is not set |  | ||||||
| CONFIG_RMNET=y |  | ||||||
| CONFIG_RMNET_DATA=y |  | ||||||
| CONFIG_RMNET_DATA_DEBUG_PKT=y |  | ||||||
| # CONFIG_RMNET_DATA_FC is not set |  | ||||||
| CONFIG_QCOM_QMI_RMNET=y |  | ||||||
| CONFIG_QCOM_QMI_DFC=y |  | ||||||
| CONFIG_QCOM_QMI_POWER_COLLAPSE=y |  | ||||||
| CONFIG_RMNET_CTL=y |  | ||||||
| CONFIG_RMNET_CTL_DEBUG=y |  | ||||||
| CONFIG_MHI_BUS_TEST=y |  | ||||||
| CONFIG_MHI_DEBUG=y |  | ||||||
| CONFIG_MHI_NETDEV=y |  | ||||||
| CONFIG_MHI_UCI=y |  | ||||||
|   | |||||||
| @@ -1,67 +0,0 @@ | |||||||
| # |  | ||||||
| # Copyright (C) 2011 OpenWrt.org |  | ||||||
| # |  | ||||||
| # This is free software, licensed under the GNU General Public License v2. |  | ||||||
| # See /LICENSE for more information. |  | ||||||
| # |  | ||||||
|  |  | ||||||
| include $(TOPDIR)/rules.mk |  | ||||||
|  |  | ||||||
| PKG_NAME:=libprotobuf-c |  | ||||||
| PKG_VERSION:=1.3.1 |  | ||||||
| PKG_RELEASE:=2 |  | ||||||
|  |  | ||||||
| PKG_SOURCE:=protobuf-c-$(PKG_VERSION).tar.gz |  | ||||||
| PKG_SOURCE_URL:=https://github.com/protobuf-c/protobuf-c/releases/download/v$(PKG_VERSION) |  | ||||||
| PKG_HASH:=51472d3a191d6d7b425e32b612e477c06f73fe23e07f6a6a839b11808e9d2267 |  | ||||||
| PKG_BUILD_DIR:=$(BUILD_DIR)/protobuf-c-$(PKG_VERSION) |  | ||||||
| HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/protobuf-c-$(PKG_VERSION) |  | ||||||
|  |  | ||||||
| PKG_MAINTAINER:=Rosen Penev <rosenp@gmail.com> |  | ||||||
| PKG_LICENSE:=BSD-2c |  | ||||||
|  |  | ||||||
| PKG_BUILD_DEPENDS:=protobuf-c/host |  | ||||||
| HOST_BUILD_DEPENDS:=protobuf/host |  | ||||||
|  |  | ||||||
| PKG_INSTALL:=1 |  | ||||||
| PKG_BUILD_PARALLEL:=1 |  | ||||||
|  |  | ||||||
| include $(INCLUDE_DIR)/package.mk |  | ||||||
| include $(INCLUDE_DIR)/host-build.mk |  | ||||||
|  |  | ||||||
| define Package/libprotobuf-c |  | ||||||
|   TITLE:=Protocol Buffers library |  | ||||||
|   SECTION:=libs |  | ||||||
|   CATEGORY:=Libraries |  | ||||||
|   URL:=https://github.com/protobuf-c/protobuf-c |  | ||||||
| endef |  | ||||||
|  |  | ||||||
| define Package/libprotobuf-c/description |  | ||||||
|   Runtime library to use Google Protocol Buffers from C applications. |  | ||||||
|   Protocol Buffers are a way of encoding structured data in an efficient yet |  | ||||||
|   extensible format. Google uses Protocol Buffers for almost all of its |  | ||||||
|   internal RPC protocols and file formats. |  | ||||||
| endef |  | ||||||
|  |  | ||||||
| CONFIGURE_ARGS += \ |  | ||||||
| 	--enable-shared \ |  | ||||||
| 	--enable-static \ |  | ||||||
| 	--disable-protoc |  | ||||||
|  |  | ||||||
| define Build/InstallDev |  | ||||||
| 	$(INSTALL_DIR) $(1)/usr/include/ |  | ||||||
| 	$(CP) $(PKG_INSTALL_DIR)/usr/include/* $(1)/usr/include/ |  | ||||||
| 	$(INSTALL_DIR) $(1)/usr/lib |  | ||||||
| 	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libprotobuf-c.{a,la,so*} $(1)/usr/lib/ |  | ||||||
| 	$(INSTALL_DIR) $(1)/usr/lib/pkgconfig |  | ||||||
| 	$(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/* $(1)/usr/lib/pkgconfig/ |  | ||||||
| endef |  | ||||||
|  |  | ||||||
| define Package/libprotobuf-c/install |  | ||||||
| 	$(INSTALL_DIR) $(1)/usr/lib |  | ||||||
| 	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libprotobuf-c.so.* $(1)/usr/lib/ |  | ||||||
| endef |  | ||||||
|  |  | ||||||
| $(eval $(call BuildPackage,libprotobuf-c)) |  | ||||||
| $(eval $(call HostBuild)) |  | ||||||
|  |  | ||||||
| @@ -1,13 +0,0 @@ | |||||||
| Index: protobuf-c-1.3.1/t/generated-code2/cxx-generate-packed-data.cc |  | ||||||
| =================================================================== |  | ||||||
| --- protobuf-c-1.3.1.orig/t/generated-code2/cxx-generate-packed-data.cc |  | ||||||
| +++ protobuf-c-1.3.1/t/generated-code2/cxx-generate-packed-data.cc |  | ||||||
| @@ -998,7 +998,7 @@ static void dump_test_packed_repeated_en |  | ||||||
|  static void dump_test_unknown_fields (void) |  | ||||||
|  { |  | ||||||
|    EmptyMess mess; |  | ||||||
| -  const google::protobuf::Message::Reflection *reflection = mess.GetReflection(); |  | ||||||
| +  const google::protobuf::Reflection *reflection = mess.GetReflection(); |  | ||||||
|    google::protobuf::UnknownFieldSet *fs = reflection->MutableUnknownFields(&mess); |  | ||||||
|   |  | ||||||
|  #if GOOGLE_PROTOBUF_VERSION >= 2001000 |  | ||||||
| @@ -1,110 +0,0 @@ | |||||||
| # |  | ||||||
| # Copyright (C) 2007-2015 OpenWrt.org |  | ||||||
| # |  | ||||||
| # This is free software, licensed under the GNU General Public License v2. |  | ||||||
| # See /LICENSE for more information. |  | ||||||
| # |  | ||||||
|  |  | ||||||
| include $(TOPDIR)/rules.mk |  | ||||||
|  |  | ||||||
| PKG_NAME:=protobuf |  | ||||||
| PKG_VERSION:=3.7.1 |  | ||||||
| PKG_RELEASE:=1 |  | ||||||
|  |  | ||||||
| PKG_SOURCE:=$(PKG_NAME)-cpp-$(PKG_VERSION).tar.gz |  | ||||||
| PKG_SOURCE_URL:=https://github.com/google/protobuf/releases/download/v$(PKG_VERSION) |  | ||||||
| PKG_HASH:=97f6cdaa0724d5a8cd3375d5f5cf4bd253d5ad5291154f533ed0d94a9d501ef3 |  | ||||||
|  |  | ||||||
| PKG_LICENSE:=BSD-3-Clause |  | ||||||
| PKG_LICENSE_FILES:=LICENSE |  | ||||||
| PKG_CPE_ID:=cpe:/a:google:protobuf |  | ||||||
|  |  | ||||||
| PKG_BUILD_DEPENDS:=protobuf/host |  | ||||||
|  |  | ||||||
| PKG_BUILD_PARALLEL:=1 |  | ||||||
| PKG_INSTALL:=1 |  | ||||||
|  |  | ||||||
| include $(INCLUDE_DIR)/package.mk |  | ||||||
| include $(INCLUDE_DIR)/host-build.mk |  | ||||||
|  |  | ||||||
| define Package/protobuf/Default |  | ||||||
|   SECTION:=libs |  | ||||||
|   CATEGORY:=Libraries |  | ||||||
|   TITLE:=A structured data encoding library |  | ||||||
|   URL:=https://github.com/google/protobuf |  | ||||||
|   DEPENDS:=+zlib +libpthread +libatomic +libstdcpp |  | ||||||
|   MAINTAINER:=Ken Keys <kkeys@caida.org> |  | ||||||
| endef |  | ||||||
|  |  | ||||||
| define Package/protobuf |  | ||||||
|   $(call Package/protobuf/Default) |  | ||||||
|   DEPENDS+=+protobuf-lite |  | ||||||
| endef |  | ||||||
|  |  | ||||||
| define Package/protobuf-lite |  | ||||||
|   $(call Package/protobuf/Default) |  | ||||||
| endef |  | ||||||
|  |  | ||||||
| define Package/protobuf/description/Default |  | ||||||
| Protocol Buffers are a way of encoding structured data in an efficient |  | ||||||
| yet extensible format. Google uses Protocol Buffers for almost all |  | ||||||
| of its internal RPC protocols and file formats. |  | ||||||
| endef |  | ||||||
|  |  | ||||||
| define Package/protobuf/description |  | ||||||
| $(call Package/protobuf/description/Default) |  | ||||||
|  |  | ||||||
| This package provides the libprotoc, libprotobuf, and libprotobuf-lite |  | ||||||
| libraries.  For a much smaller protobuf package, see "protobuf-lite". |  | ||||||
|  |  | ||||||
| endef |  | ||||||
|  |  | ||||||
| define Package/protobuf-lite/description |  | ||||||
| $(call Package/protobuf/description/Default) |  | ||||||
|  |  | ||||||
| This package provides the libprotobuf-lite library. |  | ||||||
|  |  | ||||||
| endef |  | ||||||
|  |  | ||||||
| EXTRA_CPPFLAGS+=-std=c++11 |  | ||||||
| CONFIGURE_ARGS += --with-protoc=$(STAGING_DIR_HOSTPKG)/bin/protoc |  | ||||||
|  |  | ||||||
| define Build/InstallDev |  | ||||||
| 	$(INSTALL_DIR) \ |  | ||||||
| 		$(1)/usr/lib \ |  | ||||||
| 		$(1)/usr/include |  | ||||||
|  |  | ||||||
| 	$(CP) \ |  | ||||||
| 		$(PKG_INSTALL_DIR)/usr/include/* \ |  | ||||||
| 		$(1)/usr/include/ |  | ||||||
|  |  | ||||||
| 	$(CP) \ |  | ||||||
| 		$(PKG_INSTALL_DIR)/usr/lib/* \ |  | ||||||
| 		$(1)/usr/lib/ |  | ||||||
| endef |  | ||||||
|  |  | ||||||
| define Package/protobuf-lite/install |  | ||||||
| 	$(INSTALL_DIR) \ |  | ||||||
| 		$(1)/usr/lib |  | ||||||
|  |  | ||||||
| 	$(CP) \ |  | ||||||
| 		$(PKG_INSTALL_DIR)/usr/lib/libprotobuf-lite.so* \ |  | ||||||
| 		$(1)/usr/lib/ |  | ||||||
| endef |  | ||||||
|  |  | ||||||
| define Package/protobuf/install |  | ||||||
| 	$(INSTALL_DIR) \ |  | ||||||
| 		$(1)/usr/lib |  | ||||||
|  |  | ||||||
| 	$(CP) \ |  | ||||||
| 		$(PKG_INSTALL_DIR)/usr/lib/libprotoc.so*  \ |  | ||||||
| 		$(1)/usr/lib/ |  | ||||||
|  |  | ||||||
| 	$(CP) \ |  | ||||||
| 		$(PKG_INSTALL_DIR)/usr/lib/libprotobuf.so* \ |  | ||||||
| 		$(1)/usr/lib/ |  | ||||||
| endef |  | ||||||
|  |  | ||||||
| $(eval $(call BuildPackage,protobuf)) |  | ||||||
| $(eval $(call BuildPackage,protobuf-lite)) |  | ||||||
| $(eval $(call HostBuild)) |  | ||||||
		Reference in New Issue
	
	Block a user
	 John Crispin
					John Crispin