Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
P
packages
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Iterations
Merge Requests
0
Merge Requests
0
Requirements
Requirements
List
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Test Cases
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Code Review
Insights
Issue
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
infra
packages
Commits
ddd28628
Commit
ddd28628
authored
Apr 03, 2019
by
Lars Beckers
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix version handling for custom builds
parent
741d5e77
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
17 additions
and
31 deletions
+17
-31
scripts/adcli.sh
scripts/adcli.sh
+2
-4
scripts/common.sh
scripts/common.sh
+3
-12
scripts/ganeti.sh
scripts/ganeti.sh
+5
-5
scripts/grml-zsh-config.sh
scripts/grml-zsh-config.sh
+2
-3
scripts/nginx-shib.sh
scripts/nginx-shib.sh
+2
-4
scripts/painintheapt.sh
scripts/painintheapt.sh
+3
-3
No files found.
scripts/adcli.sh
View file @
ddd28628
...
...
@@ -2,11 +2,9 @@
source
"
${
BASH_SOURCE
%/*
}
/common.sh"
VERSION
=
$(
get_sources adcli stretch
)
get_sources adcli stretch
import_patches adcli
dch_custom
$VERSION
"Apply the unreleased upstream-patches, fixing RT#100"
dch_custom
"Apply the unreleased upstream-patches, fixing RT#100"
install_build_deps
build
test_install
...
...
scripts/common.sh
View file @
ddd28628
...
...
@@ -2,25 +2,18 @@
# $1: source package name
# $2: distribution
# ->: version number retrieved
function
get_sources
()
{
local
version
apt-get
source
--only-source
-t
$2
$1
version
=
$(
rmadison
$1
--architecture
=
all,amd64
-s
$2
|
head
-n1
|
cut
-d
\|
-f2
|
sed
s
"/ //g"
|
sed
s
"/
\-
.*
$/
/g"
)
local
version
=
$(
rmadison
$1
--architecture
=
all,amd64
-s
$2
|
head
-n1
|
cut
-d
\|
-f2
|
sed
s
"/ //g"
|
sed
s
"/
\-
.*
$/
/g"
)
cd
$1
-
$version
return
$version
}
# $1: source package name
# $2: git repository
# ->: version number retrieved
function
get_git_sources
()
{
local
version
git clone
$2
$1
cd
$1
git tag
--sort
"version:refname"
-l
|
tail
-n1
| xargs git checkout
version
=
$(
git tag
--sort
"version:refname"
-l
|
tail
-n1
|
sed
s/v//
)
return
$version
}
# $1: patch directory name
...
...
@@ -40,11 +33,9 @@ function apply_patches_manually() {
done
}
# $1: official version number
# $2: changelog entry
# $1: changelog entry
function
dch_custom
()
{
# TODO consider using local suffixes like backports
debchange
--preserve
--newversion
$1
-fsmpi
$2
debchange
--local
~fsmpi+
$1
}
function
dch_backport
()
{
...
...
scripts/ganeti.sh
View file @
ddd28628
...
...
@@ -2,13 +2,13 @@
source
"
${
BASH_SOURCE
%/*
}
/common.sh"
VERSION
=
$(
get_sources ganeti stretch
)
get_sources ganeti stretch
import_patches ganeti
dch_custom
$VERSION
"Fix broken ceph support in bdev.py, see GitHub #1233."
dch_custom
$VERSION
"Remove blockdev storage from the movable and mirrored devices lists."
dch_custom
$VERSION
"Increase maximum disk count per instance."
dch_custom
$VERSION
"Add support for disk cache usage with rbd devices."
dch_custom
"Fix broken ceph support in bdev.py, see GitHub #1233."
dch_custom
"Remove blockdev storage from the movable and mirrored devices lists."
dch_custom
"Increase maximum disk count per instance."
dch_custom
"Add support for disk cache usage with rbd devices."
install_build_deps
build
...
...
scripts/grml-zsh-config.sh
View file @
ddd28628
...
...
@@ -2,12 +2,11 @@
source
"
${
BASH_SOURCE
%/*
}
/common.sh"
VERSION
=
$(
get_git_sources grml-zsh-config https://github.com/grml/grml-etc-core
)
get_git_sources grml-zsh-config https://github.com/grml/grml-etc-core
apply_patches_manually grml-zsh-config
sed
-i
s/grml-etc-core/grml-zsh-config/g debian/changelog
dch_custom
$VERSION
"Remove unneeded grml-configs"
dch_custom
"Remove unneeded grml-configs"
install_build_deps
build
test_install
...
...
scripts/nginx-shib.sh
View file @
ddd28628
...
...
@@ -2,8 +2,7 @@
source
"
${
BASH_SOURCE
%/*
}
/common.sh"
VERSION
=
$(
get_sources nginx stretch
)
get_sources nginx stretch
cd
debian
cp
libnginx-mod.nginx.skeleton libnginx-mod-http-shibboleth.nginx
cd
modules
...
...
@@ -11,8 +10,7 @@ git clone "https://github.com/nginx-shib/nginx-http-shibboleth.git"
cd
../..
patch
-d
.
-p0
< ../patches/nginx/00-add-module.patch
dch_custom
$VERSION
"Add libnginx-mod-http-shibboleth"
dch_custom
"Add libnginx-mod-http-shibboleth"
install_build_deps
build
test_install
...
...
scripts/painintheapt.sh
View file @
ddd28628
...
...
@@ -5,7 +5,7 @@ source "${BASH_SOURCE%/*}/common.sh"
echo
"deb-src http://ftp.halifax.rwth-aachen.de/debian/ buster main"
>
/etc/apt/sources.list.d/buster_src.list
apt-get update
VERSION
=
$(
get_sources painintheapt buster
)
get_sources painintheapt buster
import_patches painintheapt
sed
-i
'/python3-sleekxmpp/d'
debian/control
...
...
@@ -13,8 +13,8 @@ sed -i 's/Build-Depends: debhelper (>= 11),/Build-Depends: debhelper (>= 10),/g'
echo
"10"
>
debian/compat
dch_backport
dch_custom
$VERSION
"Add HTTP-JSON support."
dch_custom
$VERSION
"Remove XMPP support."
dch_custom
"Add HTTP-JSON support."
dch_custom
"Remove XMPP support."
install_build_deps
build
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment