Developing lightweight computation at the DSG edge

Commit 9a354562 authored by Roger Pueyo Centelles's avatar Roger Pueyo Centelles
Browse files

Merge branch 'master' into testing

parents 773dad6b e0f0ea11
......@@ -25,15 +25,20 @@
include $(TOPDIR)/rules.mk
include $(INCLUDE_DIR)/kernel.mk
BRANCH_GIT?=$(shell git rev-parse --abbrev-ref HEAD)
REV_GIT?=$(shell git rev-parse --short HEAD)
DATE_GIT?=$(shell git log -1 --format=%cd --date=format:%Y%m%d)
TIME_GIT?=$(shell git log -1 --format=%cd --date=format:%H%M)
QMP_RELEASE?=testing
QMP_PKGRELEASE=r20170831-1
QMP_CODENAME?=testing
QMP_PKGRELEASE=r$(DATE_GIT)_$(TIME_GIT)
QMP_CODENAME?=Testing
QMP_BUILDDATE:=$(shell date +%Y%m%d-%H%M)
PKG_NAME:=qmp-big-node
PKG_VERSION:=$(QMP_RELEASE)-$(QMP_PKGRELEASE)
PKG_RELEASE:=$(QMP_CODENAME)
PKG_LICENSE:=GPL-2.0+
PKG_LICENSE:=GPL-3.0+
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)
......
......@@ -25,15 +25,20 @@
include $(TOPDIR)/rules.mk
include $(INCLUDE_DIR)/kernel.mk
BRANCH_GIT?=$(shell git rev-parse --abbrev-ref HEAD)
REV_GIT?=$(shell git rev-parse --short HEAD)
DATE_GIT?=$(shell git log -1 --format=%cd --date=format:%Y%m%d)
TIME_GIT?=$(shell git log -1 --format=%cd --date=format:%H%M)
QMP_RELEASE?=testing
QMP_PKGRELEASE=r20170831-2
QMP_CODENAME?=testing
QMP_PKGRELEASE=r$(DATE_GIT)_$(TIME_GIT)
QMP_CODENAME?=Testing
QMP_BUILDDATE:=$(shell date +%Y%m%d-%H%M)
PKG_NAME:=qmp-small-node
PKG_VERSION:=$(QMP_RELEASE)-$(QMP_PKGRELEASE)
PKG_RELEASE:=$(QMP_CODENAME)
PKG_LICENSE:=GPL-2.0+
PKG_LICENSE:=GPL-3.0+
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)
......
......@@ -25,15 +25,20 @@
include $(TOPDIR)/rules.mk
include $(INCLUDE_DIR)/kernel.mk
BRANCH_GIT?=$(shell git rev-parse --abbrev-ref HEAD)
REV_GIT?=$(shell git rev-parse --short HEAD)
DATE_GIT?=$(shell git log -1 --format=%cd --date=format:%Y%m%d)
TIME_GIT?=$(shell git log -1 --format=%cd --date=format:%H%M)
QMP_RELEASE?=testing
QMP_PKGRELEASE=r20170831-1
QMP_CODENAME?=testing
QMP_PKGRELEASE=r$(DATE_GIT)_$(TIME_GIT)
QMP_CODENAME?=Testing
QMP_BUILDDATE:=$(shell date +%Y%m%d-%H%M)
PKG_NAME:=qmp-tiny-node
PKG_VERSION:=$(QMP_RELEASE)-$(QMP_PKGRELEASE)
PKG_RELEASE:=$(QMP_CODENAME)
PKG_LICENSE:=GPL-2.0+
PKG_LICENSE:=GPL-3.0+
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment