From debd9150e96554b8d92eb553d8df17b39fb2a75a Mon Sep 17 00:00:00 2001 From: Mark Riddoch Date: Mon, 13 May 2019 11:05:06 +0000 Subject: [PATCH 1/4] FOGL-2785 Correct company name in license file --- LICENSE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LICENSE b/LICENSE index fb1fb5d..6e277c7 100644 --- a/LICENSE +++ b/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2018 Dianomic Systems + Copyright 2018 Dianomic Systems Inc Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. From 3be2608169c99e3161db8a8c3dbc8538c6f0a2a0 Mon Sep 17 00:00:00 2001 From: pintomax Date: Wed, 15 May 2019 16:24:16 +0200 Subject: [PATCH 2/4] FOGL-2824: Add Package and Description files to north plugins to enable RPM generation (#13) FOGL-2824: Add Package and Description files to north plugins to enable RPM generation As librdkafka might be created with root permission we remove it. This allows the caller of requirements.sh to cleanup all the files --- Description | 1 + Package | 26 ++++++++++++++++++++++++++ requirements.sh | 2 ++ 3 files changed, 29 insertions(+) create mode 100644 Description create mode 100644 Package diff --git a/Description b/Description new file mode 100644 index 0000000..62bf6b6 --- /dev/null +++ b/Description @@ -0,0 +1 @@ +Kafka producer north plugin package for FogLAMP. diff --git a/Package b/Package new file mode 100644 index 0000000..103228a --- /dev/null +++ b/Package @@ -0,0 +1,26 @@ +# A set of variables that define how we package this repository +# +plugin_name=kafka +plugin_type=north +plugin_install_dirname=Kafka + +# Now build up the runtime requirements list. This has 3 components +# 1. Generic packages we depend on in all architectures and package managers +# 2. Architecture specific packages we depend on +# 3. Package manager specific packages we depend on +requirements="foglamp" + +case "$arch" in + x86_64) + ;; + armhf) + ;; + aarch64) + ;; +esac +case "$package_manager" in + deb) + ;; + rpm) + ;; +esac diff --git a/requirements.sh b/requirements.sh index fedc21d..5350868 100755 --- a/requirements.sh +++ b/requirements.sh @@ -29,3 +29,5 @@ cd librdkafka ./configure make sudo make install +cd .. +rm -rf librdkafka From 570dc90ba1cbb4b05ff9a3fcadd71cf772cba1b2 Mon Sep 17 00:00:00 2001 From: Mark Riddoch Date: Tue, 21 May 2019 11:30:33 +0000 Subject: [PATCH 3/4] FOGL-2771 Add Coral package --- make_deb | 3 +++ packages/Debian/arm64/DEBIAN/control | 10 ++++++++++ 2 files changed, 13 insertions(+) create mode 100644 packages/Debian/arm64/DEBIAN/control diff --git a/make_deb b/make_deb index 8fb9ebd..b945041 100755 --- a/make_deb +++ b/make_deb @@ -69,6 +69,9 @@ if [ "$(dpkg --print-architecture)" == "armhf" ]; then elif [ "$(dpkg --print-architecture)" == "amd64" ]; then echo "Building on amd64 architecture..." architecture="x86_64" +elif [ "$(dpkg --print-architecture)" == "arm64" ]; then + echo "Building on arm64 architecture..." + architecture="arm64" else echo "The host architecture is not supported for this plugin!!" exit 1 diff --git a/packages/Debian/arm64/DEBIAN/control b/packages/Debian/arm64/DEBIAN/control new file mode 100644 index 0000000..4aaa2d8 --- /dev/null +++ b/packages/Debian/arm64/DEBIAN/control @@ -0,0 +1,10 @@ +Package: foglamp-north-kafka +Version: 1.0.0 +Section: devel +Priority: optional +Architecture: arm64 +Depends: foglamp +Conflicts: +Maintainer: Dianomic Systems, Inc. +Homepage: http://www.dianomic.com +Description: FogLAMP C++ Kafka north plugin From 6a42cbc64a3e18d1be03100ca0b0d72921fa707c Mon Sep 17 00:00:00 2001 From: dianomicbot Date: Wed, 22 May 2019 12:07:50 +0000 Subject: [PATCH 4/4] VERSION changed --- VERSION | 2 +- foglamp.version | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/VERSION b/VERSION index 4cda8f1..dc1e644 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.5.2 +1.6.0 diff --git a/foglamp.version b/foglamp.version index 430e744..3260e97 100644 --- a/foglamp.version +++ b/foglamp.version @@ -1 +1 @@ -foglamp_version>=1.5 +foglamp_version>=1.6