Skip to content
Snippets Groups Projects
Commit 5a0b0617 authored by Thibault Cohen's avatar Thibault Cohen
Browse files

packaging: fix get orig source

Refs #71506

Change-Id: I3dc4a5576ab7da137b7ec41c7f275827efc561af
parent 313eec59
No related branches found
No related tags found
No related merge requests found
...@@ -8,7 +8,7 @@ VER ?= $(shell dpkg-parsechangelog -l$(PKD)/changelog | perl -ne 'print $$1 if m ...@@ -8,7 +8,7 @@ VER ?= $(shell dpkg-parsechangelog -l$(PKD)/changelog | perl -ne 'print $$1 if m
DISTRIB_ID = $(shell grep -hPo "^ID=\K.*" /etc/*ease) DISTRIB_ID = $(shell grep -hPo "^ID=\K.*" /etc/*ease)
DISTRIB_VERSION_ID = $(shell grep -hPo "^VERSION_ID=\K.*" /etc/*ease) DISTRIB_VERSION_ID = $(shell grep -hPo "^VERSION_ID=\K.*" /etc/*ease)
DAEMON_TAG = master DAEMON_TAG = origin/master
# Uncomment this to turn on verbose mode. # Uncomment this to turn on verbose mode.
export DH_VERBOSE=1 export DH_VERBOSE=1
...@@ -53,7 +53,7 @@ get-orig-source: ...@@ -53,7 +53,7 @@ get-orig-source:
git init git init
git remote add origin https://gerrit-ring.savoirfairelinux.com/ring-daemon git remote add origin https://gerrit-ring.savoirfairelinux.com/ring-daemon
git fetch --all git fetch --all
git checkout packaging-releases -f git checkout packaging -f
git config user.name "joulupukki" git config user.name "joulupukki"
git config user.email "joulupukki@localhost" git config user.email "joulupukki@localhost"
git merge $(DAEMON_TAG) --no-edit git merge $(DAEMON_TAG) --no-edit
......
%define name ring-daemon %define name ring-daemon
%define version 2.1.0 %define version 2.1.0
%define release 1 %define release 1
%define daemon_tag master %define daemon_tag origin/master
Name: %{name} Name: %{name}
Version: %{version} Version: %{version}
...@@ -43,7 +43,7 @@ This is the ring repository ...@@ -43,7 +43,7 @@ This is the ring repository
git init git init
git remote add origin https://gerrit-ring.savoirfairelinux.com/ring-daemon git remote add origin https://gerrit-ring.savoirfairelinux.com/ring-daemon
git fetch --all git fetch --all
git checkout packaging-releases -f git checkout packaging -f
git config user.name "joulupukki" git config user.name "joulupukki"
git config user.email "joulupukki@localhost" git config user.email "joulupukki@localhost"
git merge %{daemon_tag} --no-edit git merge %{daemon_tag} --no-edit
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment