diff options
| -rwxr-xr-x | build_repo.sh | 5 | ||||
| -rw-r--r-- | pkgauto.mk | 35 | ||||
| -rw-r--r-- | updater-ng/Makefile (renamed from updater-ng-auto/Makefile) | 9 | ||||
| -rw-r--r-- | updater-ng/files/updater.config (renamed from updater-ng-auto/files/updater.config) | 0 | ||||
| -rwxr-xr-x | utils/updater-ng-auto.sh | 30 |
5 files changed, 40 insertions, 39 deletions
diff --git a/build_repo.sh b/build_repo.sh index 130e239..30bfa83 100755 --- a/build_repo.sh +++ b/build_repo.sh @@ -43,8 +43,9 @@ for d in *; do [ -d .turris-sdk ] && cp -r $d .turris-sdk/package/ done -[ -d .omnia-sdk ] && ./utils/updater-ng-auto.sh .omnia-sdk/package/ -[ -d .turris-sdk ] && ./utils/updater-ng-auto.sh .turris-sdk/package/ +# Deploy pkgauto.mk +[ -d .omnia-sdk ] && cp pkgauto.mk .omnia-sdk/include/ +[ -d .turris-sdk ] && cp pkgauto.mk .turris-sdk/include/ if [ -f CONFIG ]; then echo -e "\e[1;34mApply CONFIG\e[0m" diff --git a/pkgauto.mk b/pkgauto.mk new file mode 100644 index 0000000..8bd0386 --- /dev/null +++ b/pkgauto.mk @@ -0,0 +1,35 @@ +ifneq ($(PKG_SOURCE_PROTO),git) +$(error Only supported protocol is git) +endif +ifndef PKG_NAME +$(error You have to define PKG_NAME before pkgauto.mk include) +endif +ifndef PKG_SOURCE_URL +$(error You have to define PKG_SOURCE_URL before pkgauto.mk include) +endif +ifndef PKG_SOURCE_BRANCH +$(error You have to define PKG_SOURCE_BRANCH before pkgauto.mk include) +endif + +TMP_REPO_PATH=/tmp/myrepo_$(PKG_NAME) + +GIT_ARGS=--git-dir='$(TMP_REPO_PATH)' --bare + +$(shell \ + if [ ! -d "$(TMP_REPO_PATH)" ]; then \ + git clone --bare "$(PKG_SOURCE_URL)" "$(TMP_REPO_PATH)"; \ + else \ + git $(GIT_ARGS) fetch "$(PKG_SOURCE_URL)"; \ + fi \ +) + +PKG_SOURCE_VERSION:=$(shell git $(GIT_ARGS) rev-parse $(PKG_SOURCE_BRANCH)) +PKG_VERSION:=$(shell git $(GIT_ARGS) describe --abbrev=0 --tags $(PKG_SOURCE_BRANCH) | sed 's/^v//') +PKG_RELEASE:=$(shell git $(GIT_ARGS) rev-list --count v$(PKG_VERSION)..$(PKG_SOURCE_VERSION)) + +PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz +PKG_SOURCE_SUBDIR:=$(PKG_NAME) +PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME) +HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/$(PKG_NAME) + +# TODO drop TMP_REPO_PATH $GIT_ARGS diff --git a/updater-ng-auto/Makefile b/updater-ng/Makefile index 7bf4782..38057fe 100644 --- a/updater-ng-auto/Makefile +++ b/updater-ng/Makefile @@ -8,18 +8,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=updater-ng -PKG_VERSION:=60.0.7 -PKG_RELEASE:=1 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://gitlab.labs.nic.cz/turris/updater.git -PKG_SOURCE_VERSION:=v$(PKG_VERSION) -PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz -PKG_SOURCE_SUBDIR:=$(PKG_NAME) +PKG_SOURCE_BRANCH:=HEAD PKG_MAINTAINER:=CZ.NIC <packaging@turris.cz> -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME) -HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/$(PKG_NAME) HOST_BUILD_DEPENDS:=curl/host libevent2/host lua/host +include $(INCLUDE_DIR)/pkgauto.mk include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/host-build.mk diff --git a/updater-ng-auto/files/updater.config b/updater-ng/files/updater.config index 4bc05ed..4bc05ed 100644 --- a/updater-ng-auto/files/updater.config +++ b/updater-ng/files/updater.config diff --git a/utils/updater-ng-auto.sh b/utils/updater-ng-auto.sh deleted file mode 100755 index d9157a0..0000000 --- a/utils/updater-ng-auto.sh +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/sh -# This script check if updater doesn't contain new commit and if so it bumps -# automatically. - -COMMIT=HEAD -UPDATER_REPO=https://kkoci@gitlab.labs.nic.cz/turris/updater.git -UPDATER_REPO_PATH=/tmp/myrepo_updater_repo - -if [ ! -f $1/updater-ng-auto/Makefile ]; then - # Skip this when we don't have updater-ng-auto - exit -fi - -# Update updater git repo -GIT_ARGS="--git-dir="$UPDATER_REPO_PATH" --bare" -if [ ! -d $UPDATER_REPO_PATH ]; then - git clone --bare $UPDATER_REPO $UPDATER_REPO_PATH -else - git $GIT_ARGS fetch $UPDATER_REPO master:master -fi -# Get info -HASH="$(git $GIT_ARGS rev-parse $COMMIT)" -VERSION="$(git $GIT_ARGS describe --abbrev=0 --tags $COMMIT | sed 's/^v//')" -RELEASE="$(($(git $GIT_ARGS rev-list --count v$VERSION..$COMMIT) + 1))" -VERSION="$VERSION.99999" - -# Now replace stuff in Makefile -sed -i "s/^PKG_VERSION:=.*/PKG_VERSION:=$VERSION/;s/^PKG_RELEASE:=.*/PKG_RELEASE:=$RELEASE/;s/^PKG_SOURCE_VERSION:=.*/PKG_SOURCE_VERSION:=$HASH/" $1/updater-ng-auto/Makefile - -echo -e "\e[1;35mUpdater-ng package has now version: $VERSION-$RELEASE\e[0m" |