Skip to content

Commit ded3d18

Browse files
committed
Leave xenial and stretch only
1 parent 4c9afb5 commit ded3d18

File tree

3 files changed

+124
-64
lines changed

3 files changed

+124
-64
lines changed

Makefile

Lines changed: 4 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ simple-image-pinebook-1080p-$(RELEASE_NAME).img: linux-pine64-$(RELEASE_NAME).ta
100100
export uboot=../boot-tools/boot/pine64/u-boot-pine64-pinebook-1080p.bin && \
101101
bash ./make_simpleimage.sh $(shell readlink -f "$@") 150 $(shell readlink -f linux-pine64-$(RELEASE_NAME).tar.xz)
102102

103-
BUILD_SYSTEMS := xenial zesty jessie stretch
103+
BUILD_SYSTEMS := xenial stretch
104104
BUILD_VARIANTS := minimal mate i3 openmediavault
105105
BUILD_ARCHS := arm64
106106
BUILD_MODELS := pine64 pinebook pinebook-1080p sopine
@@ -140,18 +140,6 @@ simple-image-sopine: simple-image-sopine-$(RELEASE_NAME).img.xz
140140
.PHONY: simple-image
141141
simple-image: simple-image-pinebook simple-image-pine64 simple-image-sopine
142142

143-
.PHONY: zesty-minimal-pinebook
144-
zesty-minimal-pinebook: zesty-minimal-pinebook-bspkernel-$(RELEASE_NAME)-$(RELEASE).img.xz \
145-
zesty-minimal-pinebook-1080p-bspkernel-$(RELEASE_NAME)-$(RELEASE).img.xz
146-
147-
.PHONY: xenial-mate-pinebook
148-
zesty-mate-pinebook: zesty-mate-pinebook-bspkernel-$(RELEASE_NAME)-$(RELEASE).img.xz \
149-
zesty-mate-pinebook-1080p-bspkernel-$(RELEASE_NAME)-$(RELEASE).img.xz
150-
151-
.PHONY: xenial-i3-pinebook
152-
zesty-i3-pinebook: zesty-i3-pinebook-bspkernel-$(RELEASE_NAME)-$(RELEASE).img.xz \
153-
zesty-i3-pinebook-1080p-bspkernel-$(RELEASE_NAME)-$(RELEASE).img.xz
154-
155143
.PHONY: xenial-minimal-pinebook
156144
xenial-minimal-pinebook: xenial-minimal-pinebook-bspkernel-$(RELEASE_NAME)-$(RELEASE).img.xz \
157145
xenial-minimal-pinebook-1080p-bspkernel-$(RELEASE_NAME)-$(RELEASE).img.xz
@@ -174,21 +162,8 @@ stretch-minimal-sopine: stretch-minimal-sopine-bspkernel-$(RELEASE_NAME)-$(RELEA
174162
stretch-minimal-pinebook: stretch-minimal-pinebook-bspkernel-$(RELEASE_NAME)-$(RELEASE).img.xz \
175163
stretch-minimal-pinebook-1080p-bspkernel-$(RELEASE_NAME)-$(RELEASE).img.xz
176164

177-
.PHONY: jessie-minimal-pinebook
178-
jessie-minimal-pinebook: jessie-minimal-pinebook-$(RELEASE_NAME)-$(RELEASE).img.xz \
179-
jessie-minimal-pinebook-1080p-bspkernel-$(RELEASE_NAME)-$(RELEASE).img.xz
180-
181-
.PHONY: jessie-minimal-sopine
182-
jessie-minimal-sopine: jessie-minimal-sopine-$(RELEASE_NAME)-$(RELEASE).img.xz
183-
184-
.PHONY: jessie-minimal-pine64
185-
jessie-minimal-pine64: jessie-minimal-pine64-$(RELEASE_NAME)-$(RELEASE).img.xz
186-
187-
.PHONY: jessie-openmediavault-pine64
188-
jessie-openmediavault-pine64: jessie-openmediavault-pine64-$(RELEASE_NAME)-$(RELEASE).img.xz
189-
190-
.PHONY: zesty-pinebook
191-
zesty-pinebook: zesty-minimal-pinebook zesty-mate-pinebook zesty-i3-pinebook
165+
.PHONY: stretch-openmediavault-pine64
166+
stretch-openmediavault-pine64: stretch-openmediavault-pine64-$(RELEASE_NAME)-$(RELEASE).img.xz
192167

193168
.PHONY: xenial-pinebook
194169
xenial-pinebook: xenial-minimal-pinebook xenial-mate-pinebook xenial-i3-pinebook
@@ -199,20 +174,14 @@ stretch-pinebook: stretch-minimal-pinebook
199174
.PHONY: linux-pinebook
200175
linux-pinebook: simple-image-pinebook xenial-pinebook stretch-pinebook
201176

202-
.PHONY: zesty-minimal-pine64
203-
zesty-minimal-pine64: zesty-minimal-pine64-bspkernel-$(RELEASE_NAME)-$(RELEASE).img.xz
204-
205177
.PHONY: xenial-minimal-pine64
206178
xenial-minimal-pine64: xenial-minimal-pine64-bspkernel-$(RELEASE_NAME)-$(RELEASE).img.xz
207179

208180
.PHONY: linux-pine64
209181
linux-pine64: simple-image-pine64 xenial-minimal-pine64 stretch-minimal-pine64
210182

211-
.PHONY: zesty-minimal-sopine
212-
zesty-minimal-sopine: zesty-minimal-sopine-bspkernel-$(RELEASE_NAME)-$(RELEASE).img.xz
213-
214183
.PHONY: xenial-minimal-sopine
215-
xenial-minimal-sopine: xenial-minimal-sopine-bspkernel-$(RELEASE_NAME)-$(RELEASE).img.xz
184+
xenial-minimal-sopine: xenial-minimal-sopine-bspkernel-$(RELEASE_NAME)-$(RELEASE).img.xz
216185

217186
.PHONY: linux-sopine
218187
linux-sopine: simple-image-sopine xenial-minimal-sopine stretch-minimal-sopine

package/root/usr/local/sbin/install_openmediavault.sh

Lines changed: 116 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,62 +1,153 @@
11
#!/bin/bash
22

3-
if [[ "$(lsb_release -c -s)" != "jessie" ]]; then
4-
echo "This script only works on Debian/Jessie"
5-
exit 1
3+
case "$(lsb_release -c -s)" in
4+
jessie)
5+
RELEASE="erasmus"
6+
EXTRAS_URL="https://github.com/OpenMediaVault-Plugin-Developers/packages/raw/master/openmediavault-omvextrasorg_latest_all3.deb"
7+
;;
8+
9+
stretch)
10+
RELEASE="arrakis"
11+
EXTRAS_URL="https://github.com/OpenMediaVault-Plugin-Developers/packages/raw/master/openmediavault-omvextrasorg_latest_all4.deb"
12+
;;
13+
14+
*)
15+
echo "This script only works on Debian/Jessie|Stretch"
16+
exit 1
17+
esac
18+
19+
echo "OpenMediaVault installation script"
20+
echo "Script is based on Armbian, OMV and tkaiser work: https://github.com/armbian/build/blob/master/config/templates/customize-image.sh.template"
21+
echo ""
22+
echo "This script overwrites network interfaces."
23+
echo "Make sure that you configured them in OpenMediaVault interface before rebooting."
24+
echo ""
25+
26+
if [[ -t 0 ]]; then
27+
echo "In order to continue type YES or cancel:"
28+
while read PROMPT; do
29+
if [[ "$PROMPT" == "YES" ]]; then
30+
break
31+
fi
32+
done
633
fi
734

835
set -xe
936

10-
# Based on https://github.com/armbian/build/blob/b13e92911e91e34b0b9189c704f3186a0b3788f0/scripts/customize-image.sh.template#L31
11-
1237
#Add OMV source.list and Update System
1338
cat > /etc/apt/sources.list.d/openmediavault.list <<- EOF
14-
# deb http://packages.openmediavault.org/public erasmus main
15-
deb https://openmediavault.github.io/packages/ erasmus main
39+
# deb http://packages.openmediavault.org/public $RELEASE main
40+
deb https://openmediavault.github.io/packages/ $RELEASE main
1641
## Uncomment the following line to add software from the proposed repository.
17-
# deb http://packages.openmediavault.org/public erasmus-proposed main
18-
deb https://openmediavault.github.io/packages/ erasmus-proposed main
42+
# deb http://packages.openmediavault.org/public $RELEASE-proposed main
43+
deb https://openmediavault.github.io/packages/ $RELEASE-proposed main
1944
2045
## This software is not part of OpenMediaVault, but is offered by third-party
2146
## developers as a service to OpenMediaVault users.
22-
# deb http://packages.openmediavault.org/public erasmus partner
47+
# deb http://packages.openmediavault.org/public $RELEASE partner
2348
EOF
2449

2550
# Add OMV and OMV Plugin developer keys
51+
apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 24863F0C716B980B 7E7A6C592EF35D13 7AA630A1EDEE7D73
2652
apt-get update -y
27-
apt-get --yes --force-yes --allow-unauthenticated install openmediavault-keyring
28-
apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 7AA630A1EDEE7D73
2953

3054
# install debconf-utils, postfix and OMV
3155
debconf-set-selections <<< "postfix postfix/mailname string openmediavault"
3256
debconf-set-selections <<< "postfix postfix/main_mailer_type string 'No configuration'"
33-
apt-get -y install \
34-
debconf-utils postfix
57+
apt-get -y install debconf-utils postfix
3558

3659
# install openmediavault
37-
apt-get --yes install openmediavault
60+
apt-get --yes install openmediavault openmediavault-keyring
3861

3962
# install OMV extras, enable folder2ram, tweak some settings
4063
FILE=$(mktemp)
41-
wget http://omv-extras.org/openmediavault-omvextrasorg_latest_all3.deb -qO $FILE && dpkg -i $FILE && rm $FILE
64+
wget "$EXTRAS_URL" -qO $FILE
65+
dpkg -i $FILE
4266
/usr/sbin/omv-update
4367

44-
# use folder2ram instead of log2ram with OMV
68+
# FIX TFTPD ipv4
69+
[ -f /etc/default/tftpd-hpa ] && sed -i 's/--secure/--secure --ipv4/' /etc/default/tftpd-hpa
70+
71+
# load OMV helpers
72+
. /usr/share/openmediavault/scripts/helper-functions
73+
74+
# use folder2ram
4575
apt-get -y install openmediavault-flashmemory
46-
sed -i -e '/<flashmemory>/,/<\/flashmemory>/ s/<enable>0/<enable>1/' \
47-
-e '/<ssh>/,/<\/ssh>/ s/<enable>0/<enable>1/' \
48-
-e '/<ntp>/,/<\/ntp>/ s/<enable>0/<enable>1/' \
76+
xmlstarlet ed -L -u "/config/services/flashmemory/enable" -v "1" ${OMV_CONFIG_FILE}
77+
78+
# enable ssh, but disallow root login
79+
xmlstarlet ed -L -u "/config/services/ssh/enable" -v "1" ${OMV_CONFIG_FILE}
80+
xmlstarlet ed -L -u "/config/services/ssh/permitrootlogin" -v "0" ${OMV_CONFIG_FILE}
81+
82+
# enable ntp
83+
xmlstarlet ed -L -u "/config/system/time/ntp/enable" -v "1" ${OMV_CONFIG_FILE}
84+
85+
# improve netatalk performance
86+
apt-get -y install openmediavault-netatalk
87+
AFP_Options="mimic model = Macmini"
88+
xmlstarlet ed -L -u "/config/services/afp/extraoptions" -v "$(echo -e "${AFP_Options}")" ${OMV_CONFIG_FILE}
89+
90+
# improve samba performance
91+
SMB_Options="min receivefile size = 16384\nwrite cache size = 524288\ngetwd cache = yes\nsocket options = TCP_NODELAY IPTOS_LOWDELAY"
92+
xmlstarlet ed -L -u "/config/services/smb/extraoptions" -v "$(echo -e "${SMB_Options}")" ${OMV_CONFIG_FILE}
93+
94+
# fix timezone
95+
xmlstarlet ed -L -u "/config/system/time/timezone" -v "UTC" ${OMV_CONFIG_FILE}
96+
97+
# fix hostname
98+
xmlstarlet ed -L -u "/config/system/network/dns/hostname" -v "$(cat /etc/hostname)" ${OMV_CONFIG_FILE}
99+
100+
# disable monitoring
101+
xmlstarlet ed -L -u "/config/system/monitoring/perfstats/enable" -v "0" ${OMV_CONFIG_FILE}
102+
103+
# disable journal for rrdcached
104+
sed -i 's|-j /var/lib/rrdcached/journal/ ||' /etc/init.d/rrdcached
105+
106+
# add eth0 interface
107+
xmlstarlet ed -L \
108+
-s /config/system/network/interfaces -t elem -n interface \
109+
-s /config/system/network/interfaces/interface -t elem -n uuid -v 4fa8fd59-e5be-40f6-a76d-be6a73ed1407 \
110+
-s /config/system/network/interfaces/interface -t elem -n type -v ethernet \
111+
-s /config/system/network/interfaces/interface -t elem -n devicename -v eth0 \
112+
-s /config/system/network/interfaces/interface -t elem -n method -v dhcp \
113+
-s /config/system/network/interfaces/interface -t elem -n method6 -v manual \
49114
/etc/openmediavault/config.xml
50115

116+
# configure cpufreq
117+
cat <<EOF >>/etc/default/openmediavault
118+
OMV_CPUFREQUTILS_GOVERNOR=ondemand
119+
OMV_CPUFREQUTILS_MINSPEED=0
120+
OMV_CPUFREQUTILS_MAXSPEED=0
121+
EOF
122+
123+
cat <<EOF >>/etc/rsyslog.d/omv-armbian.conf
124+
:msg, contains, "do ionice -c1" ~
125+
:msg, contains, "action " ~
126+
:msg, contains, "netsnmp_assert" ~
127+
:msg, contains, "Failed to initiate sched scan" ~
128+
EOF
129+
130+
# update configs
131+
/usr/sbin/omv-mkconf monit
132+
/usr/sbin/omv-mkconf netatalk
133+
/usr/sbin/omv-mkconf samba
134+
/usr/sbin/omv-mkconf timezone
135+
/usr/sbin/omv-mkconf collectd
51136
/usr/sbin/omv-mkconf flashmemory
137+
/usr/sbin/omv-mkconf ssh
52138
/usr/sbin/omv-mkconf ntp
139+
/usr/sbin/omv-mkconf cpufrequtils
140+
/usr/sbin/omv-mkconf interfaces
53141

54-
systemctl disable log2ram
55-
/sbin/folder2ram -enablesystemd
56-
sed -i 's|-j /var/lib/rrdcached/journal/ ||' /etc/init.d/rrdcached
142+
# make sure that rrdcached/php does exist
143+
mkdir -p /var/lib/rrdcached /var/lib/php
57144

58-
#FIX TFTPD ipv4
59-
[ -f /etc/default/tftpd-hpa ] && sed -i 's/--secure/--secure --ipv4/' /etc/default/tftpd-hpa
145+
# disable rrdcached
146+
systemctl disable rrdcached
147+
148+
/sbin/folder2ram -enablesystemd
149+
/sbin/folder2ram -mountall || true
150+
/sbin/folder2ram -umountall || true
60151

61152
# init OMV
62153
# /usr/sbin/omv-initsystem

simpleimage/make_rootfs.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -83,12 +83,12 @@ case $DISTRO in
8383
ROOTFS="http://archlinuxarm.org/os/ArchLinuxARM-aarch64-latest.tar.gz"
8484
TAR_OPTIONS="-z"
8585
;;
86-
xenial|zesty)
86+
xenial|bionic)
8787
version=$(curl -s https://api.github.com/repos/$RELEASE_REPO/releases/latest | jq -r ".tag_name")
8888
ROOTFS="https://github.com/$RELEASE_REPO/releases/download/${version}/ubuntu-${DISTRO}-${VARIANT}-${version}-${BUILD_ARCH}.tar.xz"
8989
TAR_OPTIONS="-J --strip-components=1 binary"
9090
;;
91-
sid|jessie|stretch)
91+
sid|stretch)
9292
version=$(curl -s https://api.github.com/repos/$RELEASE_REPO/releases/latest | jq -r ".tag_name")
9393
ROOTFS="https://github.com/$RELEASE_REPO/releases/download/${version}/debian-${DISTRO}-${VARIANT}-${version}-${BUILD_ARCH}.tar.xz"
9494
TAR_OPTIONS="-J --strip-components=1 binary"
@@ -143,7 +143,7 @@ case $DISTRO in
143143
echo "No longer supported"
144144
exit 1
145145
;;
146-
xenial|sid|jessie|stretch)
146+
xenial|bionic|sid|jessie|stretch)
147147
rm "$DEST/etc/resolv.conf"
148148
cp /etc/resolv.conf "$DEST/etc/resolv.conf"
149149
DEB=ubuntu
@@ -166,7 +166,7 @@ apt-get -y install sudo sunxi-disp-tool \
166166
dosfstools curl xz-utils iw rfkill wpasupplicant openssh-server \
167167
alsa-utils nano git build-essential vim jq wget ca-certificates \
168168
htop figlet gdisk parted rsync
169-
if [[ "$DISTRO" == "xenial" || "$DISTRO" == "zesty" ]]; then
169+
if [[ "$DISTRO" == "xenial" || "$DISTRO" == "bionic" ]]; then
170170
apt-get -y install landscape-common
171171
fi
172172
adduser --gecos $DEBUSER --disabled-login $DEBUSER --uid 1000

0 commit comments

Comments
 (0)