Skip to content

Commit 5426792

Browse files
committed
Drop Debian <= 7 and Ubuntu <= 14.04 support
This doesn't clean as much since on Debian sysvinit support is installed even on systemd.
1 parent 792faff commit 5426792

File tree

3 files changed

+3
-48
lines changed

3 files changed

+3
-48
lines changed

resources/puppetlabs/lein-ezbake/template/global/controller.sh.erb

Lines changed: 1 addition & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -37,28 +37,12 @@ if [ -d ext/docs ]; then
3737
cp -r "$basepath/base_deb" "$basepath/systemd_deb"
3838
DESTDIR="$basepath/systemd_deb" bash install.sh systemd_deb
3939
fi
40-
if [ ! -d "$basepath/systemd_notasksmax_deb" ]; then
41-
cp -r "$basepath/base_deb" "$basepath/systemd_notasksmax_deb"
42-
DESTDIR="$basepath/systemd_notasksmax_deb" USE_TASKSMAX=false bash install.sh systemd_deb
43-
fi
44-
if [ ! -d "$basepath/sysvinit_deb" ]; then
45-
cp -r "$basepath/base_deb" "$basepath/sysvinit_deb"
46-
DESTDIR="$basepath/sysvinit_deb" bash install.sh sysv_init_deb
47-
fi
4840
fi
4941
else
5042
if [ ! -d "$basepath/systemd_deb" ]; then
5143
cp -r "$basepath/base" "$basepath/systemd_deb"
5244
DESTDIR="$basepath/systemd_deb" bash install.sh systemd_deb
5345
fi
54-
if [ ! -d "$basepath/systemd_notasksmax_deb" ]; then
55-
cp -r "$basepath/base" "$basepath/systemd_notasksmax_deb"
56-
DESTDIR="$basepath/systemd_notasksmax_deb" USE_TASKSMAX=false bash install.sh systemd_deb
57-
fi
58-
if [ ! -d "$basepath/sysvinit_deb" ]; then
59-
cp -r "$basepath/base" "$basepath/sysvinit_deb"
60-
DESTDIR="$basepath/sysvinit_deb" bash install.sh sysv_init_deb
61-
fi
6246
fi
6347

6448
os=$build_os
@@ -72,15 +56,7 @@ case $os in
7256
# there's no differences in packaging for deb vs ubuntu
7357
# if that changes we'll need to fix this
7458
debian|ubuntu)
75-
if [ "$os_dist" = 'trusty' ]; then
76-
dir="$basepath/sysvinit_deb"
77-
elif [ "$os_dist" = 'jessie' ]; then
78-
# the version of systemd that ships with jessie doesn't
79-
# support TasksMax
80-
dir="$basepath/systemd_notasksmax_deb"
81-
else
82-
dir="$basepath/systemd_deb"
83-
fi
59+
dir="$basepath/systemd_deb"
8460
;;
8561
amazon|el|redhatfips|sles)
8662
dir="$basepath/systemd_el"

resources/puppetlabs/lein-ezbake/template/global/ext/fpm.rb

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -139,11 +139,7 @@
139139
when :amazon, :fedora, :sles, :el, :redhatfips
140140
['etc', 'opt', 'usr', 'var']
141141
when :debian, :ubuntu
142-
if options.dist == 'trusty' #trusty is the only sysv deb we build for right now
143-
['etc', 'opt', 'var']
144-
else
145-
['etc', 'lib', 'opt', 'usr', 'var']
146-
end
142+
['etc', 'lib', 'opt', 'usr', 'var']
147143
else
148144
fail "I don't know what your default sources should be, pass it on the command line!"
149145
end

resources/puppetlabs/lein-ezbake/template/global/install.sh.erb

Lines changed: 1 addition & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -78,12 +78,7 @@ function task_service {
7878
elif [ "$OSFAMILY" = "Debian" ]; then
7979
unitdir=${unitdir_debian}
8080
defaultsdir=${defaultsdir_debian}
81-
sysv_codenames=("squeeze" "wheezy" "lucid" "precise" "trusty")
82-
if $(echo ${sysv_codenames[@]} | grep -q $CODENAME) ; then
83-
task install_source_deb_sysv
84-
else
85-
task install_source_deb_systemd
86-
fi
81+
task install_source_deb_systemd
8782
else
8883
echo "Unsupported platform, exiting ..."
8984
exit 1
@@ -100,15 +95,6 @@ function task_install_source_rpm_systemd {
10095
task postinst_permissions
10196
}
10297

103-
# Source based install for Debian based + sysv setups
104-
function task_install_source_deb_sysv {
105-
task preinst_deb
106-
task install_deb
107-
task sysv_init_deb
108-
task logrotate
109-
task postinst_deb
110-
}
111-
11298
# Source based install for Debian based + systemd setups
11399
function task_install_source_deb_systemd {
114100
task preinst_deb
@@ -262,9 +248,6 @@ function task_systemd_deb {
262248
task sysv_init_deb
263249
install -d -m 0755 "${DESTDIR}${unitdir_debian}"
264250
install -m 0644 ext/debian/<%= EZBake::Config[:project] %>.service_file "${DESTDIR}${unitdir_debian}/<%= EZBake::Config[:project] %>.service"
265-
if [ "$USE_TASKSMAX" == "false" ]; then
266-
sed -i "s/^TasksMax/# Don't set TasksMax since the option doesn't exist\n# TasksMax/" "${DESTDIR}${unitdir_debian}/<%= EZBake::Config[:project] %>.service"
267-
fi
268251
install -d -m 0755 "${DESTDIR}${tmpfilesdir}"
269252
install -m 0644 ext/<%= EZBake::Config[:project] %>.tmpfiles.conf "${DESTDIR}${tmpfilesdir}/<%= EZBake::Config[:project] %>.conf"
270253
install -d -m 0755 "${DESTDIR}${needrestart_confdir}"

0 commit comments

Comments
 (0)