diff options
Diffstat (limited to 'package/mender')
| -rw-r--r-- | package/mender/0001-FIX-Enabling-compiling-ppc64le.patch | 37 | ||||
| -rw-r--r-- | package/mender/Config.in | 2 | ||||
| -rw-r--r-- | package/mender/mender-device-identity | 52 | ||||
| -rw-r--r-- | package/mender/mender-inventory-hostinfo | 21 | ||||
| -rw-r--r-- | package/mender/mender-inventory-network | 47 | ||||
| -rw-r--r-- | package/mender/mender.conf | 20 | ||||
| -rw-r--r-- | package/mender/mender.hash | 39 | ||||
| -rw-r--r-- | package/mender/mender.mk | 46 | ||||
| -rw-r--r-- | package/mender/mender.service | 1 | ||||
| -rw-r--r-- | package/mender/tenant.conf | 0 |
10 files changed, 124 insertions, 141 deletions
diff --git a/package/mender/0001-FIX-Enabling-compiling-ppc64le.patch b/package/mender/0001-FIX-Enabling-compiling-ppc64le.patch new file mode 100644 index 0000000000..3197a0ec01 --- /dev/null +++ b/package/mender/0001-FIX-Enabling-compiling-ppc64le.patch @@ -0,0 +1,37 @@ +From 2b13f9a50793fdc15199925000107cb0cc4e7bad Mon Sep 17 00:00:00 2001 +From: Angelo Compagnucci <angelo@amarulasolutions.com> +Date: Thu, 9 Aug 2018 09:28:06 +0200 +Subject: [PATCH] FIX: Enabling compiling ppc64le + +This patch enables Mender compilation on ppc64le + +Changelog: FIX: Enabling compiling ppc64le + +Signed-off-by: Angelo Compagnucci <angelo@amarulasolutions.com> +Signed-off-by: Giulio Benetti <giulio.benetti@micronovasrl.com> +--- + ioctl_64_bit.go | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/ioctl_64_bit.go b/ioctl_64_bit.go +index 6f61a6c..f1e2dd8 100644 +--- a/ioctl_64_bit.go ++++ b/ioctl_64_bit.go +@@ -1,4 +1,4 @@ +-// Copyright 2017 Northern.tech AS ++// Copyright 2018 Northern.tech AS + // + // Licensed under the Apache License, Version 2.0 (the "License"); + // you may not use this file except in compliance with the License. +@@ -12,7 +12,7 @@ + // See the License for the specific language governing permissions and + // limitations under the License. + +-// +build amd64 arm64 ++// +build amd64 arm64 ppc64le + + package main + +-- +2.17.1 + diff --git a/package/mender/Config.in b/package/mender/Config.in index e461857486..aeb0b2694f 100644 --- a/package/mender/Config.in +++ b/package/mender/Config.in @@ -3,6 +3,8 @@ config BR2_PACKAGE_MENDER depends on BR2_PACKAGE_HOST_GO_ARCH_SUPPORTS depends on BR2_PACKAGE_HOST_GO_CGO_LINKING_SUPPORTS depends on BR2_TOOLCHAIN_HAS_THREADS + select BR2_PACKAGE_UBOOT_TOOLS # runtime + select BR2_PACKAGE_UBOOT_TOOLS_FWPRINTENV # runtime help Mender is an open source over-the-air (OTA) software updater for embedded Linux devices. Mender comprises a client diff --git a/package/mender/mender-device-identity b/package/mender/mender-device-identity deleted file mode 100644 index d87f843357..0000000000 --- a/package/mender/mender-device-identity +++ /dev/null @@ -1,52 +0,0 @@ -#!/bin/sh - -# Example script called by Mender agent to collect device identity data. The -# script needs to be located at -# $(datadir)/mender/identity/mender-device-identity path for the agent to find -# it. The script shall exit with non-0 status on errors. In this case the agent -# will discard any output the script may have produced. -# -# The script shall output identity data in <key>=<value> format, one -# entry per line. Example -# -# $ ./mender-device-identity -# mac=de:ad:ca:fe:00:01 -# cpuid=1112233 -# -# The example script collects the MAC address of a network interface with the -# type ARPHRD_ETHER and it will pick the interface with the lowest ifindex -# number if there are multiple interfaces with that type. The identity data is -# output in the following format: -# -# mac=00:01:02:03:04:05 -# - -set -ue - -SCN=/sys/class/net -min=65535 -arphrd_ether=1 -ifdev= - -# find iface with lowest ifindex, skip non ARPHRD_ETHER types (lo, sit ...) -for dev in $SCN/*; do - iftype=$(cat $dev/type) - if [ $iftype -ne $arphrd_ether ]; then - continue - fi - - idx=$(cat $dev/ifindex) - if [ $idx -lt $min ]; then - min=$idx - ifdev=$dev - fi -done - -if [ -z "$ifdev" ]; then - echo "no suitable interfaces found" >&2 - exit 1 -else - echo "using interface $ifdev" >&2 - # grab MAC address - echo "mac=$(cat $ifdev/address)" -fi diff --git a/package/mender/mender-inventory-hostinfo b/package/mender/mender-inventory-hostinfo deleted file mode 100644 index cf508fdf88..0000000000 --- a/package/mender/mender-inventory-hostinfo +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/sh -# -# The example script collects information about current host -# - -set -ue - -LC_ALL=C -export LC_ALL - -grep 'model name' /proc/cpuinfo | uniq | awk -F': ' ' - // { printf("cpu_model=%s\n", $2);} -' -echo "kernel=$(cat /proc/version)" - -cat /proc/meminfo | awk ' -/MemTotal/ {printf("mem_total_kB=%d\n", $2)} -' - -echo "hostname=$(cat /etc/hostname)" - diff --git a/package/mender/mender-inventory-network b/package/mender/mender-inventory-network deleted file mode 100644 index b017c4ea14..0000000000 --- a/package/mender/mender-inventory-network +++ /dev/null @@ -1,47 +0,0 @@ -#!/bin/sh -# -# Example script called by Mender agent to collect inventory data for a -# particular devce. The script needs to be located in $(datadir)/mender and its -# name shall start with `mender-inventory-` prefix. The script shall exit with -# non-0 status on errors. In this case the agent will discard any output the -# script may have produced. -# -# The script shall output inventory data in <key>=<value> format, one entry per -# line. Entries appearing multiple times will be joined in a list under the same -# key. -# -# $ ./mender-inventory-network -# mac_br-fbfdad18c33c=02:42:7e:74:96:85 -# network_interfaces=br-fbfdad18c33c -# ipv4_br-fbfdad18c33c=172.21.0.1/16 -# mac_enp0s25=de:ad:be:ef:bb:05 -# network_interfaces=enp0s25 -# ipv4_enp0s25=123.22.0.197/16 -# ipv4_enp0s25=10.20.20.105/16 -# ipv6_enp0s25=fe80::2aad:beff:feef:bb05/64 -# -# -# The example script collects the list of network interfaces, as well as -# ethernet and IP addresses of each of the interfaces. -# - -set -ue - -SCN=/sys/class/net -min=65535 -ifdev= - -# find iface with lowest ifindex, except loopback -for devpath in $SCN/*; do - dev=$(basename $devpath) - if [ $dev = "lo" ]; then - continue - fi - echo "mac_$dev=$(cat $devpath/address)" - echo "network_interfaces=$dev" - - ip addr show dev $dev | awk -v dev=$dev ' - /inet / { printf("ipv4_%s=%s\n", dev, $2) } - /inet6 / {printf("ipv6_%s=%s\n", dev, $2) } - ' -done diff --git a/package/mender/mender.conf b/package/mender/mender.conf index a5c7c545c3..979f16aaf6 100644 --- a/package/mender/mender.conf +++ b/package/mender/mender.conf @@ -1,14 +1,10 @@ { - "ClientProtocol": "http", - "HttpsClient": { - "Certificate": "", - "Key": "" - }, - "RootfsPartA": "@MENDER_ROOTFS_PART_A@", - "RootfsPartB": "@MENDER_ROOTFS_PART_B@", - "UpdatePollIntervalSeconds": @MENDER_UPDATE_POLL_INTERVAL_SECONDS@, - "InventoryPollIntervalSeconds": @MENDER_INVENTORY_POLL_INTERVAL_SECONDS@, - "RetryPollIntervalSeconds": @MENDER_RETRY_POLL_INTERVAL_SECONDS@, - "ServerURL": "@MENDER_SERVER_URL@", - "ServerCertificate": "@MENDER_CERT_LOCATION@" + "InventoryPollIntervalSeconds": 1800, + "UpdatePollIntervalSeconds": 1800, + "RetryPollIntervalSeconds": 300, + "RootfsPartA": "mmcblk0p2", + "RootfsPartB": "mmcblk0p3", + "ServerCertificate": "/etc/mender/server.crt", + "ServerURL": "https://docker.mender.io", + "TenantToken": "dummy" } diff --git a/package/mender/mender.hash b/package/mender/mender.hash index 30a04fad7a..8faa740e3b 100644 --- a/package/mender/mender.hash +++ b/package/mender/mender.hash @@ -1,2 +1,41 @@ # Locally computed: sha256 267fa73ad472b034248ee298593b5c52ea0b105fd73c91febb3587280c61bee2 mender-1.4.0.tar.gz + +# Apache-2.0 license, locally computed +sha256 ceb1b36ff073bd13d9806d4615b931707768ca9023805620acc32dd1cfc2f680 LICENSE + +# Vendor licenses +# Generated with sed '/^[A-Za-z0-9_]/s/^/sha256 /' LIC_FILES_CHKSUM.sha256 + +# Apache-2.0 license. +sha256 ceb1b36ff073bd13d9806d4615b931707768ca9023805620acc32dd1cfc2f680 vendor/github.com/mendersoftware/mendertesting/LICENSE +sha256 3591f687e2d6f49c83b1ec69577e8110afbde80be5ec81791bd86d2838ccd3de vendor/github.com/mendersoftware/log/LICENSE +sha256 bbb303820971c294a9a8e5eba5affcf1379036e877ea61c11cbf9400b2949483 vendor/github.com/mendersoftware/log/COPYING +sha256 3591f687e2d6f49c83b1ec69577e8110afbde80be5ec81791bd86d2838ccd3de vendor/github.com/mendersoftware/scopestack/LICENSE +sha256 bbb303820971c294a9a8e5eba5affcf1379036e877ea61c11cbf9400b2949483 vendor/github.com/mendersoftware/scopestack/COPYING +sha256 b40930bbcf80744c86c46a12bc9da056641d722716c378f5659b9e555ef833e1 vendor/github.com/mendersoftware/mender-artifact/LICENSE + +# BSD 2 Clause license. +sha256 8d427fd87bc9579ea368fde3d49f9ca22eac857f91a9dec7e3004bdfab7dee86 vendor/github.com/pkg/errors/LICENSE + +# BSD 3 Clause license. +sha256 2eb550be6801c1ea434feba53bf6d12e7c71c90253e0a9de4a4f46cf88b56477 vendor/github.com/pmezard/go-difflib/LICENSE +sha256 2d36597f7117c38b006835ae7f537487207d8ec407aa9d9980794b2030cbc067 vendor/golang.org/x/sys/LICENSE +sha256 2d36597f7117c38b006835ae7f537487207d8ec407aa9d9980794b2030cbc067 vendor/golang.org/x/net/LICENSE +sha256 0634b008cee55ca01f0888d2f5aba2d34e66c3f52c31a4e16a5d5d33d0c2a03e vendor/github.com/bmatsuo/lmdb-go/LICENSE.md + +# ISC license. +sha256 3525392c6db3b804af76980b2c560ee9ec1abdadd907d76a26091df7c78f3a25 vendor/github.com/davecgh/go-spew/LICENSE + +# MIT license. +sha256 51a0c9ec7f8b7634181b8d4c03e5b5d204ac21d6e72f46c313973424664b2e6b vendor/github.com/Sirupsen/logrus/LICENSE +sha256 402f39eed8a1851385d0703999aa9f23d067c2ea3e15c63c074e389cbf8f8f8f vendor/github.com/stretchr/testify/LICENSE +sha256 402f39eed8a1851385d0703999aa9f23d067c2ea3e15c63c074e389cbf8f8f8f vendor/github.com/stretchr/testify/LICENCE.txt +sha256 fde7d610b9b95fc5a6304055c4dae951025b630aaa42a24e95ebf76675ae832c vendor/github.com/stretchr/objx/LICENSE.md +sha256 ffa15bdce332058a03a1d923910864fb6e58bf6df66a0e3914284725b327183e vendor/github.com/ungerik/go-sysfs/LICENSE + +# OpenLDAP Public License +sha256 310fe25c858a9515fc8c8d7d1f24a67c9496f84a91e0a0e41ea9975b1371e569 vendor/github.com/bmatsuo/lmdb-go/LICENSE.mdb.md + +# sha256 of all the vendor licenses combined +sha256 54d6f54a2815cc2e3cef4f7dde5a3aae20f09b2cde394d8d3f1dce5d8a79d738 LIC_FILES_CHKSUM.sha256 diff --git a/package/mender/mender.mk b/package/mender/mender.mk index 695b5e7a91..9275426a7b 100644 --- a/package/mender/mender.mk +++ b/package/mender/mender.mk @@ -6,20 +6,50 @@ MENDER_VERSION = 1.4.0 MENDER_SITE = $(call github,mendersoftware,mender,$(MENDER_VERSION)) +MENDER_LICENSE = Apache-2.0, BSD-2-Clause, BSD-3-Clause, ISC, MIT, OLDAP-2.8 + +# Vendor license paths generated with: +# awk '{print $2}' LIC_FILES_CHKSUM.sha256 | grep vendor +MENDER_LICENSE_FILES = \ + LICENSE \ + LIC_FILES_CHKSUM.sha256 \ + vendor/github.com/mendersoftware/mendertesting/LICENSE \ + vendor/github.com/mendersoftware/log/LICENSE \ + vendor/github.com/mendersoftware/log/COPYING \ + vendor/github.com/mendersoftware/scopestack/LICENSE \ + vendor/github.com/mendersoftware/scopestack/COPYING \ + vendor/github.com/mendersoftware/mender-artifact/LICENSE \ + vendor/github.com/pkg/errors/LICENSE \ + vendor/github.com/pmezard/go-difflib/LICENSE \ + vendor/golang.org/x/sys/LICENSE \ + vendor/golang.org/x/net/LICENSE \ + vendor/github.com/bmatsuo/lmdb-go/LICENSE.md \ + vendor/github.com/davecgh/go-spew/LICENSE \ + vendor/github.com/Sirupsen/logrus/LICENSE \ + vendor/github.com/stretchr/testify/LICENSE \ + vendor/github.com/stretchr/testify/LICENCE.txt \ + vendor/github.com/stretchr/objx/LICENSE.md \ + vendor/github.com/ungerik/go-sysfs/LICENSE \ + vendor/github.com/bmatsuo/lmdb-go/LICENSE.mdb.md + +MENDER_LDFLAGS = -X main.Version=$(MENDER_VERSION) define MENDER_INSTALL_CONFIG_FILES + $(INSTALL) -d -m 755 $(TARGET_DIR)/etc/mender/scripts + echo -n "2" > $(TARGET_DIR)/etc/mender/scripts/version + $(INSTALL) -D -m 0644 package/mender/mender.conf \ $(TARGET_DIR)/etc/mender/mender.conf - $(INSTALL) -D -m 0644 package/mender/tenant.conf \ - $(TARGET_DIR)/etc/mender/tenant.conf + $(INSTALL) -D -m 0644 package/mender/server.crt \ $(TARGET_DIR)/etc/mender/server.crt - $(INSTALL) -D -m 0755 package/mender/mender-device-identity \ - $(TARGET_DIR)/var/share/mender/identity/mender-device-identity - $(INSTALL) -D -m 0755 package/mender/mender-inventory-network \ - $(TARGET_DIR)/var/share/mender/inventory/mender-inventory-network - $(INSTALL) -D -m 0755 package/mender/mender-inventory-hostinfo \ - $(TARGET_DIR)/var/share/mender/inventory/mender-inventory-hostinfo + + $(INSTALL) -D -m 0755 $(@D)/support/mender-device-identity \ + $(TARGET_DIR)/usr/share/mender/identity/mender-device-identity + $(foreach f,hostinfo network, \ + $(INSTALL) -D -m 0755 $(@D)/support/mender-inventory-$(f) \ + $(TARGET_DIR)/usr/share/mender/inventory/mender-inventory-$(f) + ) endef MENDER_POST_INSTALL_TARGET_HOOKS += MENDER_INSTALL_CONFIG_FILES diff --git a/package/mender/mender.service b/package/mender/mender.service index ec77fbc46c..9ede55acb5 100644 --- a/package/mender/mender.service +++ b/package/mender/mender.service @@ -7,7 +7,6 @@ Type=idle User=root Group=root ExecStartPre=/bin/mkdir -p -m 0700 /data/mender -ExecStartPre=/bin/ln -sf /etc/mender/tenant.conf /var/lib/mender/authtentoken ExecStart=/usr/bin/mender -daemon Restart=on-abort diff --git a/package/mender/tenant.conf b/package/mender/tenant.conf deleted file mode 100644 index e69de29bb2..0000000000 --- a/package/mender/tenant.conf +++ /dev/null |
