Commit b5e99b5b authored by Daniel Baumann's avatar Daniel Baumann
Browse files

Dropping support for wheezy.

parent a767601f
squeeze
\ No newline at end of file
......@@ -288,15 +288,7 @@ Set_defaults ()
*)
case "${LB_SYSTEM}" in
live)
case "${LB_PARENT_DISTRIBUTION}" in
wheezy)
LB_INITSYSTEM="${LB_INITSYSTEM:-sysvinit}"
;;
*)
LB_INITSYSTEM="${LB_INITSYSTEM:-systemd}"
;;
esac
LB_INITSYSTEM="${LB_INITSYSTEM:-systemd}"
;;
normal)
......@@ -533,14 +525,7 @@ Set_defaults ()
*)
# armel will have special images: one rootfs image and many additional kernel images.
# therefore we default to all available armel flavours
case "${LB_DISTRIBUTION}" in
wheezy)
LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-iop32x ixp4xx kirkwood orion5x versatile}"
;;
*)
LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-ixp4xx kirkwood orion5x versatile}"
;;
esac
LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-ixp4xx kirkwood orion5x versatile}"
;;
esac
;;
......@@ -548,14 +533,7 @@ Set_defaults ()
armhf)
# armhf will have special images: one rootfs image and many additional kernel images.
# therefore we default to all available armhf flavours
case "${LB_DISTRIBUTION}" in
wheezy)
LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-mx5 omap}"
;;
*)
LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-armmp armmp-lpae}"
;;
esac
LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-armmp armmp-lpae}"
;;
amd64)
......
......@@ -9,8 +9,8 @@
# Debian releases
RELEASE_wheezy="7"
RELEASE_jessie="8"
RELEASE_stretch="9"
RELEASE_sid="unstable"
# Progress Linux releases
......
......@@ -55,18 +55,6 @@ Create_lockfile .lock
# Checking depends
Check_package chroot/usr/bin/xorriso xorriso
case "${LB_PARENT_DISTRIBUTION}" in
wheezy)
_ISOHDPFX="/usr/lib/syslinux/isohdpfx.bin"
Check_package chroot/${_ISOHDPFX} syslinux-common
;;
*)
_ISOHDPFX="/usr/lib/ISOLINUX/isohdpfx.bin"
Check_package chroot/${_ISOHDPFX} isolinux
;;
esac
# Restoring cache
Restore_cache cache/packages.binary
......@@ -85,7 +73,7 @@ XORRISO_OPTIONS="-R -r -J -joliet-long -l -cache-inodes"
# Handle xorriso live-build specific options
if [ "${LIVE_IMAGE_TYPE}" = "iso-hybrid" ]
then
XORRISO_OPTIONS="${XORRISO_OPTIONS} -isohybrid-mbr ${_ISOHDPFX} -partition_offset 16"
XORRISO_OPTIONS="${XORRISO_OPTIONS} -isohybrid-mbr /usr/lib/ISOLINUX/isohdpfx.bin -partition_offset 16"
fi
if [ "${_QUIET}" = "true" ]
......
......@@ -120,34 +120,10 @@ else
fi
fi
# legacy compatibility for wheezy
if [ -e "${_SOURCE}.${LB_PARENT_DISTRIBUTION}" ]
then
_SOURCE="${_SOURCE}.${LB_PARENT_DISTRIBUTION}"
fi
# Checking depends
case "${LB_BUILD_WITH_CHROOT}" in
true)
case "${LB_PARENT_DISTRIBUTION}" in
wheezy)
case "${_BOOTLOADER}" in
syslinux|extlinux)
Check_package chroot/usr/bin/${_BOOTLOADER} ${_BOOTLOADER}
;;
*)
Check_package chroot/usr/lib/syslinux syslinux-common
;;
esac
;;
*)
Check_package chroot/usr/lib/$(echo ${_BOOTLOADER} | tr [a-z] [A-Z]) ${_BOOTLOADER}
Check_package chroot/usr/lib/syslinux syslinux-common
;;
esac
Check_package chroot/usr/lib/$(echo ${_BOOTLOADER} | tr [a-z] [A-Z]) ${_BOOTLOADER}
Check_package chroot/usr/lib/syslinux syslinux-common
if ls "${_SOURCE}"/*.svg* > /dev/null 2>&1
......@@ -157,37 +133,11 @@ case "${LB_BUILD_WITH_CHROOT}" in
;;
false)
case "${LB_PARENT_DISTRIBUTION}" in
wheezy)
case "${_BOOTLOADER}" in
syslinux|extlinux)
if [ ! -e /usr/bin/${_BOOTLOADER} ]
then
# syslinux or extlinux
Echo_error "/usr/bin/${_BOOTLOADER} - no such file."
exit 1
fi
;;
*)
if ! ls /usr/lib/syslinux/${_BOOTLOADER}* > /dev/null 2>&1
then
Echo_error "/usr/lib/syslinux/${_BOOTLOADER}* - no such files."
exit 1
fi
;;
esac
;;
*)
if [ ! -e "/usr/share/$(echo ${_BOOTLOADER} | tr [a-z] [A-Z])" ]
then
Echo_error "/usr/share/$(echo ${_BOOTLOADER} | tr [a-z] [A-Z])"
exit 1
fi
;;
esac
if [ ! -e "/usr/share/$(echo ${_BOOTLOADER} | tr [a-z] [A-Z])" ]
then
Echo_error "/usr/share/$(echo ${_BOOTLOADER} | tr [a-z] [A-Z])"
exit 1
fi
if [ ! -e /usr/lib/syslinux ]
then
......
......@@ -1360,27 +1360,19 @@ then
echo "live-boot" > config/package-lists/live.list.chroot
echo "live-config" >> config/package-lists/live.list.chroot
case "${LB_PARENT_DISTRIBUTION}" in
wheezy)
echo "live-config-sysvinit" >> config/package-lists/live.list.chroot
case "${LB_INITSYSTEM}" in
none)
# do nothing
;;
*)
case "${LB_INITSYSTEM}" in
none)
# do nothing
;;
systemd)
echo "live-config-systemd" >> config/package-lists/live.list.chroot
echo "dbus" >> config/package-lists/live.list.chroot
;;
sysvinit|upstart)
echo "live-config-${LB_INITSYSTEM}" >> config/package-lists/live.list.chroot
echo "sysvinit-core" >> config/package-lists/live.list.chroot
;;
esac
systemd)
echo "live-config-systemd" >> config/package-lists/live.list.chroot
echo "dbus" >> config/package-lists/live.list.chroot
;;
sysvinit|upstart)
echo "live-config-${LB_INITSYSTEM}" >> config/package-lists/live.list.chroot
echo "sysvinit-core" >> config/package-lists/live.list.chroot
;;
esac
;;
......
......@@ -754,7 +754,7 @@ EOF
mv chroot/root/binary ./
case "${LB_PARENT_DISTRIBUTION}" in
wheezy)
jessie)
DISTRIBUTIONS="stable"
;;
......
label hdt
menu label ^Hardware Detection Tool (HDT)
com32 hdt.c32
label memtest
menu label ^Memory Diagnostic Tool (memtest86+)
linux /live/memtest
include menu.cfg
default vesamenu.c32
prompt 0
timeout 0
/usr/lib/syslinux/hdt.c32
\ No newline at end of file
label install
menu label ^Install
linux /install/vmlinuz
initrd /install/initrd.gz
append vga=788 @APPEND_INSTALL@ -- quiet
label installgui
menu label ^Graphical install
linux /install/gtk/vmlinuz
initrd /install/gtk/initrd.gz
append video=vesa:ywrap,mtrr vga=788 @APPEND_INSTALL@ -- quiet
label live-@FLAVOUR@
menu label ^Live (@FLAVOUR@)
menu default
linux @LINUX@
initrd @INITRD@
append @APPEND_LIVE@
label live-@FLAVOUR@-failsafe
menu label ^Live (@FLAVOUR@ failsafe)
linux @LINUX@
initrd @INITRD@
append @APPEND_LIVE_FAILSAFE@
menu hshift 0
menu width 82
menu title Boot menu
include stdmenu.cfg
include live.cfg
include install.cfg
menu begin advanced
menu title Advanced options
include stdmenu.cfg
label mainmenu
menu label ^Back..
menu exit
include advanced.cfg
menu end
menu clear
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="640"
height="480"
id="svg3320"
version="1.1"
inkscape:version="0.48.3.1 r9886"
sodipodi:docname="splash.svg.in">
<defs
id="defs3322">
<radialGradient
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1.402663,0,0,1.115648,-6.237984,0.0533075)"
r="18.370251"
fy="10.943316"
fx="15.491823"
cy="10.943316"
cx="15.491823"
id="radialGradient2813"
xlink:href="#linearGradient2807"
inkscape:collect="always" />
<radialGradient
r="35.934704"
fy="424.15677"
fx="131.23691"
cy="424.15677"
cx="131.23691"
gradientTransform="matrix(0.101953,-0.04272301,0.09621296,0.229599,-48.67227,-64.24148)"
gradientUnits="userSpaceOnUse"
id="radialGradient2798"
xlink:href="#linearGradient8543"
inkscape:collect="always" />
<radialGradient
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1,0,0,0.415385,0,26.70146)"
r="30.365856"
fy="45.673546"
fx="29.898689"
cy="45.673546"
cx="29.898689"
id="radialGradient18290"
xlink:href="#linearGradient18284"
inkscape:collect="always" />
<radialGradient
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(0.105628,-0.04514018,0.06692574,0.156607,-46.01605,-24.35485)"
r="103.26014"
fy="409.83737"
fx="340.35886"
cy="409.83737"
cx="340.35886"
id="radialGradient13895"
xlink:href="#linearGradient8543"
inkscape:collect="always" />
<radialGradient
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(0.08174351,0.01024998,-0.04335971,0.345793,6.123413,-84.50421)"
r="38.451698"
fy="270.67969"
fx="424.99243"
cy="270.67969"
cx="424.99243"
id="radialGradient11208"
xlink:href="#linearGradient11202"
inkscape:collect="always" />
<radialGradient
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(0.272962,-0.071724,0.05616202,0.213737,-78.54657,-24.30491)"
r="48.782982"
fy="243.06874"
fx="293.81989"
cy="243.06874"
cx="293.81989"
id="radialGradient10317"
xlink:href="#linearGradient8543"
inkscape:collect="always" />
<radialGradient
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(0.224796,0.01017229,-0.00975947,0.215674,-73.87964,-54.89804)"
r="40.975471"
fy="286.46918"
fx="500.97794"
cy="286.46918"
cx="500.97794"
id="radialGradient9434"
xlink:href="#linearGradient8543"
inkscape:collect="always" />
<radialGradient
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(0.163532,-0.01065754,0.01078108,0.165425,-46.18187,-65.65506)"
r="235.88632"
fy="685.99139"
fx="420.87839"
cy="685.99139"
cx="420.87839"
id="radialGradient8549"
xlink:href="#linearGradient8543"
inkscape:collect="always" />
<radialGradient
r="297.21338"
fy="-72.420044"
fx="336.73767"
cy="-72.420044"
cx="336.73767"
gradientTransform="matrix(0.136507,0,-4.484926e-5,0.07137743,-23.39816,12.31028)"
gradientUnits="userSpaceOnUse"
id="radialGradient7666"
xlink:href="#linearGradient5012"
inkscape:collect="always" />
<linearGradient
id="linearGradient5012">
<stop
id="stop5014"
offset="0"
style="stop-color:#fdf188;stop-opacity:1;" />
<stop
id="stop5016"
offset="1"
style="stop-color:#d3bc00;stop-opacity:1;" />
</linearGradient>
<linearGradient
id="linearGradient8543">
<stop
id="stop8545"
offset="0"
style="stop-color:#fffef5;stop-opacity:0.94117647;" />
<stop
id="stop8547"
offset="1"
style="stop-color:#fce94f;stop-opacity:0;" />
</linearGradient>
<linearGradient
id="linearGradient11202">
<stop
id="stop11204"
offset="0"
style="stop-color:#c4a000;stop-opacity:1;" />
<stop
id="stop11206"
offset="1"
style="stop-color:#c4a000;stop-opacity:0;" />
</linearGradient>
<linearGradient
id="linearGradient18284">
<stop
id="stop18286"
offset="0"
style="stop-color:#000000;stop-opacity:1;" />
<stop
style="stop-color:#000000;stop-opacity:1;"
offset="0.5"
id="stop20913" />
<stop
style="stop-color:#000000;stop-opacity:0;"
offset="1"
id="stop19165" />
</linearGradient>
<linearGradient
id="linearGradient2807"
inkscape:collect="always">
<stop
id="stop2809"
offset="0"
style="stop-color:#ffffff;stop-opacity:1;" />
<stop
id="stop2811"
offset="1"
style="stop-color:#ffffff;stop-opacity:0;" />
</linearGradient>
<inkscape:perspective
id="perspective47"
inkscape:persp3d-origin="24 : 16 : 1"
inkscape:vp_z="48 : 24 : 1"
inkscape:vp_y="0 : 1000 : 0"
inkscape:vp_x="0 : 24 : 1"
sodipodi:type="inkscape:persp3d" />
</defs>
<sodipodi:namedview
id="base"
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="0.775"
inkscape:cx="574.36733"
inkscape:cy="250.84337"
inkscape:document-units="px"
inkscape:current-layer="layer1"
showgrid="false"
inkscape:window-width="1016"
inkscape:window-height="570"
inkscape:window-x="0"
inkscape:window-y="1"
inkscape:window-maximized="0" />
<metadata
id="metadata3325">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title></dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
<g
inkscape:label="Layer 1"
inkscape:groupmode="layer"
id="layer1"
transform="translate(0,-572.3622)">
<rect
style="fill:#000000;fill-opacity:1;stroke:none"
id="rect3328"
width="640"
height="480"
x="0"
y="572.36218" />
<text
transform="scale(1.0000015,0.99999849)"
sodipodi:linespacing="100%"
id="text3002"
y="619.20685"
x="190.68135"
style="font-size:35.65467453px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:100%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;font-family:DejaVu Sans;-inkscape-font-specification:DejaVu Sans Bold"
xml:space="preserve"><tspan
y="619.20685"
x="190.68135"
sodipodi:role="line"
style="font-size:19.99996948px;font-style:normal;font-weight:bold;-inkscape-font-specification:DejaVu Sans Bold"
id="tspan3045">@PROJECT@ @VERSION@ (@DISTRIBUTION@)</tspan><tspan
y="639.20679"
x="190.68135"
sodipodi:role="line"
style="font-size:19.99996948px;font-style:normal;font-weight:bold;-inkscape-font-specification:DejaVu Sans Bold"
id="tspan3041">@ARCHITECTURE@</tspan><tspan
y="659.20679"
x="190.68135"
sodipodi:role="line"
style="font-size:19.99996948px;font-style:normal;font-weight:bold;-inkscape-font-specification:DejaVu Sans Bold"
id="tspan3037" /><tspan
y="679.20679"
x="190.68135"
sodipodi:role="line"
style="font-size:19.99996948px;font-style:normal;font-weight:bold;-inkscape-font-specification:DejaVu Sans Bold"
id="tspan3039">Build: @YEAR@-@MONTH@-@DAY@ @HOUR@:@MINUTE@:@SECOND@</tspan><tspan
y="699.20673"
x="190.68135"
sodipodi:role="line"
style="font-size:19.99996948px;font-style:normal;font-weight:bold;-inkscape-font-specification:DejaVu Sans Bold"
id="tspan3098" /><tspan
y="719.20667"
x="190.68135"
sodipodi:role="line"
style="font-size:19.99996948px;font-style:normal;font-weight:normal;-inkscape-font-specification:DejaVu Sans"
id="tspan3102">linux: @LINUX_VERSIONS@</tspan><tspan
y="739.20667"
x="190.68135"
sodipodi:role="line"
style="font-size:19.99996948px;font-style:normal;font-weight:normal;-inkscape-font-specification:DejaVu Sans"
id="tspan3076">live-build: @LIVE_BUILD_VERSION@</tspan><tspan
y="759.20667"
x="190.68135"
sodipodi:role="line"
style="font-size:19.99996948px;font-style:normal;font-weight:normal;-inkscape-font-specification:DejaVu Sans"
id="tspan3068">live-boot: @LIVE_BOOT_VERSION@</tspan><tspan
y="779.2066"
x="190.68135"
sodipodi:role="line"
style="font-size:19.99996948px;font-style:normal;font-weight:normal;-inkscape-font-specification:DejaVu Sans"
id="tspan3070">live-config: @LIVE_CONFIG_VERSION@</tspan><tspan
y="799.20654"
x="190.68135"
sodipodi:role="line"
style="font-size:19.99996948px;font-style:normal;font-weight:normal;-inkscape-font-specification:DejaVu Sans"
id="tspan3012">live-tools: @LIVE_TOOLS_VERSION@</tspan><tspan
y="819.20654"
x="190.68135"
sodipodi:role="line"
style="font-size:19.99996948px;font-style:normal;font-weight:normal;-inkscape-font-specification:DejaVu Sans"
id="tspan3066" /></text>
<text
xml:space="preserve"
style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
x="200"
y="336.7742"
id="text3114"
sodipodi:linespacing="125%"
transform="translate(0,572.3622)"><tspan
sodipodi:role="line"
id="tspan3116" /></text>
<g
id="layer1-9"
inkscape:label="Layer 1"
transform="matrix(2.8369273,0,0,2.8369235,27.782921,602.43406)">
<path
transform="matrix(0.742527,0,-0.05812964,1.428611,4.500517,-36.68345)"
d="m 60.264545,45.673546 c 0,6.966249 -13.595256,12.613509 -30.365856,12.613509 -16.770599,0 -30.3658559,-5.64726 -30.3658559,-12.613509 0,-6.966249 13.5952569,-12.613509 30.3658559,-12.613509 16.7706,0 30.365856,5.64726 30.365856,12.613509 z"
sodipodi:ry="12.613509"
sodipodi:rx="30.365856"
sodipodi:cy="45.673546"
sodipodi:cx="29.898689"
id="path17409"
style="fill:url(#radialGradient18290);fill-opacity:1;stroke:none"
sodipodi:type="arc" />
<path
sodipodi:nodetypes="cccscsssscsccsc"
id="path3120"
d="M 23.152758,1.1801876 C 20.380218,1.2190783 17.86582,1.8908769 15.634281,3.0196314 14.541531,5.1714614 10.9437,7.7293655 9.4689484,8.0015561 6.5691703,11.460832 4.6887193,15.805035 3.9754523,19.98162 c -4.375e-4,0.0026 4.366e-4,0.0052 0,0.0077 -1.1863594,1.549717 -1.6900108,3.396594 -1.3773472,5.53256 1.1211744,7.659314 3.2821678,14.888292 8.1850959,16.556275 7.154429,2.433946 21.871769,1.785847 25.129507,0.458258 7.13903,-2.909286 7.771453,-9.285098 8.891432,-16.780256 0.305554,-2.044832 -0.144835,-3.841202 -1.230601,-5.372942 -0.009,-0.0556 -0.01849,-0.111474 -0.02832,-0.167342 C 42.763966,15.777007 40.697859,11.326849 37.602582,7.8466935 35.508773,7.62926 31.462964,4.270333 30.483158,2.6229925 28.330506,1.7020155 25.961342,1.1801876 23.407632,1.1801876 c -0.08532,0 -0.170037,-0.00119 -0.254874,0 z"
style="fill:url(#radialGradient7666);fill-opacity:1;stroke:#c4a000;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
inkscape:connector-curvature="0" />
<path
sodipodi:nodetypes="ccscc"
id="path7668"
d="M 43.629688,22.792984 C 39.033494,39.233217 10.438199,40.802737 3.7832765,23.04227 3.7410682,39.366403 10.103414,44.083889 28.189955,43.247454 c 3.061977,-0.140689 10.00982,0.04287 14.614484,-9.136776 2.238365,-11.5104 0.825249,-11.317694 0.825249,-11.317694 z"
style="opacity:0.66666667;fill:url(#radialGradient8549);fill-opacity:1;fill-rule:evenodd;stroke:none"
inkscape:connector-curvature="0" />
<path
sodipodi:nodetypes="cccc"
id="path8553"
d="m 34.691565,7.6783057 2.500881,1.1253976 c 0,0 -1.310404,10.1226397 -6.669016,16.4849717 1.771665,-6.455834 4.188975,-17.6103693 4.168135,-17.6103693 z"
style="fill:url(#radialGradient9434);fill-opacity:1;fill-rule:evenodd;stroke:none"
inkscape:connector-curvature="0" />
<path
sodipodi:nodetypes="cccc"
id="path9436"
d="m 15.872437,4.1562328 c 1.50053,9.0656942 6.50229,19.4860282 6.002115,20.0070452 -4.584948,-6.981624 -6.502291,-12.921217 -8.00282,-17.9229779 0,-0.083363 2.000705,-2.0632267 2.000705,-2.0840673 z"
style="fill:url(#radialGradient10317);fill-opacity:1;fill-rule:evenodd;stroke:none"
inkscape:connector-curvature="0" />