Skip to content

Commit 3119bbf

Browse files
committed
Make stretch just yet-another debian distribution
1 parent 4149ccf commit 3119bbf

File tree

1 file changed

+1
-21
lines changed

1 file changed

+1
-21
lines changed

simpleimage/make_rootfs.sh

Lines changed: 1 addition & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -225,19 +225,6 @@ deb http://security.debian.org/ ${release}/updates main contrib non-free
225225
EOF
226226
}
227227

228-
add_stretch_apt_sources() {
229-
local release="$1"
230-
local aptsrcfile="$DEST/etc/apt/sources.list"
231-
cat > "$aptsrcfile" <<EOF
232-
deb http://deb.debian.org/debian stretch main contrib non-free
233-
deb-src http://deb.debian.org/debian stretch main contrib non-free
234-
deb http://deb.debian.org/debian stretch-updates main contrib non-free
235-
deb-src http://deb.debian.org/debian stretch-updates main contrib non-free
236-
deb http://security.debian.org/ stretch/updates main contrib non-free
237-
deb-src http://security.debian.org/ stretch/updates main contrib non-free
238-
EOF
239-
}
240-
241228
add_ubuntu_apt_sources() {
242229
local release="$1"
243230
cat > "$DEST/etc/apt/sources.list" <<EOF
@@ -277,21 +264,14 @@ case $DISTRO in
277264
ubuntu-minimal \
278265
sunxi-disp-tool \
279266
"
280-
elif [ "$DISTRO" = "sid" -o "$DISTRO" = "jessie" ]; then
267+
elif [ "$DISTRO" = "sid" -o "$DISTRO" = "jessie" -o "$DISTRO" = "stretch" ]; then
281268
DEB=debian
282269
DEBUSER=pine64
283270
DEBUSERPW=pine64
284271
ADDPPACMD=""
285272
EXTRADEBS="sudo"
286273
ADDPPACMD=
287274
DISPTOOLCMD=
288-
elif [ "$DISTRO" = "stretch" ]; then
289-
DEB=stretch
290-
DEBUSER=pine64
291-
DEBUSERPW=pine64
292-
EXTRADEBS="sudo"
293-
ADDPPACMD=
294-
DISPTOOLCMD=
295275
else
296276
echo "Unknown DISTRO=$DISTRO"
297277
exit 2

0 commit comments

Comments
 (0)