diff options
author | Fathi Boudra <fathi.boudra@linaro.org> | 2013-09-08 15:18:43 +0300 |
---|---|---|
committer | Fathi Boudra <fathi.boudra@linaro.org> | 2013-09-08 15:18:43 +0300 |
commit | cb63a6b94e55dccd5e175a7d0a38f9fde1bbf4cd (patch) | |
tree | 9b0faee3f2c4925d4bc76301137db54d66a2e235 | |
parent | 363e84a246fedd52bac382b84e5df9213abe0a4a (diff) |
sid-kvm-debian: generate a normal image instead of live image
Signed-off-by: Fathi Boudra <fathi.boudra@linaro.org>
18 files changed, 227 insertions, 439 deletions
diff --git a/sid-kvm-debian/Makefile b/sid-kvm-debian/Makefile index 60c4a94..6c4263d 100755 --- a/sid-kvm-debian/Makefile +++ b/sid-kvm-debian/Makefile @@ -12,20 +12,19 @@ LOGFILE=$(IMAGEPREFIX).build-log.txt CONFIGFILE=$(IMAGEPREFIX).config.tar.bz2 LISTFILE=$(IMAGEPREFIX).contents PKGSFILE=$(IMAGEPREFIX).packages -GZFILE=$(IMAGEPREFIX).img.gz +TARGZFILE=$(IMAGEPREFIX).tar.gz MD5SUMSFILE=$(IMAGEPREFIX).md5sums.txt SHA1SUMSFILE=$(IMAGEPREFIX).sha1sums.txt all: set -e; sudo lb build 2>&1 | tee $(LOGFILE) - if [ -f binary.img ]; then \ + if [ -f binary-tar.tar.gz ]; then \ tar -jcf $(CONFIGFILE) auto/ config/ configure; \ sudo mv binary.contents $(LISTFILE); \ sudo mv binary.packages $(PKGSFILE); \ - sudo mv binary.img $(IMAGEPREFIX).img; \ - gzip -9 --rsyncable $(IMAGEPREFIX).img; \ - md5sum $(LOGFILE) $(CONFIGFILE) $(LISTFILE) $(PKGSFILE) $(GZFILE) > $(MD5SUMSFILE); \ - sha1sum $(LOGFILE) $(CONFIGFILE) $(LISTFILE) $(PKGSFILE) $(GZFILE) > $(SHA1SUMSFILE); \ + sudo mv binary-tar.tar.gz $(TARGZFILE); \ + md5sum $(LOGFILE) $(CONFIGFILE) $(LISTFILE) $(PKGSFILE) $(TARGZFILE) > $(MD5SUMSFILE); \ + sha1sum $(LOGFILE) $(CONFIGFILE) $(LISTFILE) $(PKGSFILE) $(TARGZFILE) > $(SHA1SUMSFILE); \ fi clean: diff --git a/sid-kvm-debian/configure b/sid-kvm-debian/configure index 82587aa..13a51de 100755 --- a/sid-kvm-debian/configure +++ b/sid-kvm-debian/configure @@ -16,9 +16,12 @@ lb config \ --apt-secure false \ --architectures amd64 \ --archive-areas 'main contrib non-free' \ - --binary-images hdd \ - --bootappend-live "boot=live config quiet hostname=linaro-sid username=linaro" \ + --binary-filesystem ext4 \ + --binary-images tar \ + --bootloader grub \ + --bootappend-live "quiet hostname=linaro-sid username=linaro" \ --cache false \ + --chroot-filesystem none \ --compression gzip \ --debootstrap-options "--variant=minbase" \ --distribution sid \ @@ -29,7 +32,7 @@ lb config \ --memtest none \ --mode debian \ --security false \ - --system live \ + --system normal \ --updates false echo "I: copy customization" diff --git a/sid-kvm-debian/customization/bootloaders/syslinux/install.cfg b/sid-kvm-debian/customization/bootloaders/syslinux/install.cfg deleted file mode 100644 index 94fb816..0000000 --- a/sid-kvm-debian/customization/bootloaders/syslinux/install.cfg +++ /dev/null @@ -1 +0,0 @@ -# FIXME diff --git a/sid-kvm-debian/customization/bootloaders/syslinux/live.cfg.in b/sid-kvm-debian/customization/bootloaders/syslinux/live.cfg.in deleted file mode 100644 index 97ceb92..0000000 --- a/sid-kvm-debian/customization/bootloaders/syslinux/live.cfg.in +++ /dev/null @@ -1,12 +0,0 @@ -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@ diff --git a/sid-kvm-debian/customization/bootloaders/syslinux/menu.c32 b/sid-kvm-debian/customization/bootloaders/syslinux/menu.c32 Binary files differdeleted file mode 100644 index 33c76d0..0000000 --- a/sid-kvm-debian/customization/bootloaders/syslinux/menu.c32 +++ /dev/null diff --git a/sid-kvm-debian/customization/bootloaders/syslinux/menu.cfg b/sid-kvm-debian/customization/bootloaders/syslinux/menu.cfg deleted file mode 100644 index 6e2ae94..0000000 --- a/sid-kvm-debian/customization/bootloaders/syslinux/menu.cfg +++ /dev/null @@ -1,10 +0,0 @@ -menu hshift 0 -menu width 82 - -menu title Boot menu -include stdmenu.cfg -include live.cfg -include install.cfg -menu end - -menu clear diff --git a/sid-kvm-debian/customization/bootloaders/syslinux/splash.svg.in b/sid-kvm-debian/customization/bootloaders/syslinux/splash.svg.in deleted file mode 100644 index 4c3e3d3..0000000 --- a/sid-kvm-debian/customization/bootloaders/syslinux/splash.svg.in +++ /dev/null @@ -1,388 +0,0 @@ -<?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">@DESCRIPTION@ @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" /> - <path - sodipodi:nodetypes="ccsc" - id="path10319" - d="M 30.21082,3.8227818 C 26.126047,20.328594 25.959322,23.079563 25.959322,23.079563 c 0,0 6.335566,-16.7559003 6.335566,-17.1727135 0,-8e-7 -1.583891,-1.5005286 -2.084068,-2.0840677 z" - style="fill:url(#radialGradient11208);fill-opacity:1;fill-rule:evenodd;stroke:none" - inkscape:connector-curvature="0" /> - <flowRoot - id="flowRoot12974" - xml:space="preserve"><flowRegion - id="flowRegion12976"><rect - y="412.80496" - x="86.787514" - height="16.02231" - width="40.055775" - id="rect12978" /></flowRegion><flowPara - id="flowPara12980" /></flowRoot> <path - sodipodi:nodetypes="ccccccc" - id="path13014" - d="m 16.18209,34.476182 -0.04467,-9.569745 14.493727,0 1.642604,-1.263542 -16.931465,0 0.04467,10.640581 0.795134,0.192706 z" - style="fill:url(#radialGradient13895);fill-opacity:1;fill-rule:evenodd;stroke:none" - inkscape:connector-curvature="0" /> - <path - sodipodi:nodetypes="ccccc" - id="path13897" - d="m 31.043495,24.81709 0.08168,9.804611 0.686144,-0.214742 0.01198,-10.85341 -0.779803,1.263541 z" - style="fill:#958401;fill-opacity:1;fill-rule:evenodd;stroke:none" - inkscape:connector-curvature="0" /> - <path - sodipodi:nodetypes="ccccscc" - id="path16526" - d="m 4.2551267,24.106065 c 0,0 2.3166503,8.115689 10.2209413,8.766037 1.105608,2.490418 -1.13497,4.124601 -1.13497,4.124601 L 9.7315781,36.745641 c 0,0 -6.2387745,-7.992942 -6.4882087,-9.900882 -0.2494325,-1.907937 0.1632835,-3.407793 0.1632835,-3.407793 l 0.8484738,0.669099 z" - style="fill:url(#radialGradient2798);fill-opacity:1;fill-rule:evenodd;stroke:none" - inkscape:connector-curvature="0" /> - <path - style="opacity:0.74444442;fill:none;stroke:#ffffff;stroke-width:0.99999976;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" - d="M 23.184204,2.3889904 C 20.570275,2.4256563 18.199721,3.0590226 16.095844,4.1232033 15.065608,6.1519314 11.673602,8.563503 10.283218,8.8201221 7.5493302,12.0815 5.776456,16.17718 5.1039936,20.11483 c -4.124e-4,0.0024 4.116e-4,0.0049 0,0.0073 -1.1184901,1.46106 -1.8584936,3.246475 -1.5637169,5.260247 1.0570343,7.22114 2.9276025,13.709677 7.3279793,15.639454 5.923141,2.597582 21.539722,1.785935 24.611092,0.534295 6.73062,-2.742852 7.061699,-8.930694 8.117606,-15.997069 0.288074,-1.927851 -0.13655,-3.621454 -1.160201,-5.065566 -0.0084,-0.05242 -0.01743,-0.105097 -0.0267,-0.157769 C 41.673494,16.150755 39.725585,11.955182 36.807382,8.6741189 34.833356,8.4691243 31.019,5.3023548 30.095246,3.7492553 28.065743,2.8809656 25.832115,2.3889904 23.424497,2.3889904 c -0.08044,0 -0.160309,-0.00112 -0.240293,0 z" - id="path2703" - sodipodi:nodetypes="cccscsssscsccsc" - inkscape:connector-curvature="0" /> - <path - sodipodi:nodetypes="cccssccscccssc" - id="path2800" - d="m 22.59375,2.78125 c -2.329557,0.1165682 -4.440971,0.7250384 -6.34375,1.6875 -1.010725,1.9903059 -4.354698,4.373241 -5.71875,4.625 -2.6821095,3.199611 -4.4027734,7.199424 -5.0625,11.0625 -4.046e-4,0.0024 4.038e-4,0.02888 0,0.03125 -1.0973069,1.43339 -1.4580267,3.591148 -1.4580267,3.591148 4.685267,3.605062 7.6416117,0.213892 14.3188727,-2.01722 12.59928,1.923141 18.748338,-0.995945 22.514154,-5.667678 0.0069,-0.0085 -0.0035,-0.02088 0,-0.03125 C 39.852567,13.479666 38.411479,11.016387 36.5625,8.9375 34.62586,8.7363873 30.875008,5.6486852 29.96875,4.125 27.977684,3.2731547 25.79952,2.78125 23.4375,2.78125 c -0.07892,10e-8 -0.171531,-0.0011 -0.25,0 -0.200346,0.00281 -0.39633,-0.00988 -0.59375,0 z" - style="opacity:0.59444424;fill:url(#radialGradient2813);fill-opacity:1;stroke:none" - inkscape:connector-curvature="0" /> - </g> - </g> -</svg> diff --git a/sid-kvm-debian/customization/bootloaders/syslinux/stdmenu.cfg b/sid-kvm-debian/customization/bootloaders/syslinux/stdmenu.cfg deleted file mode 100644 index d4036bf..0000000 --- a/sid-kvm-debian/customization/bootloaders/syslinux/stdmenu.cfg +++ /dev/null @@ -1,15 +0,0 @@ -menu background splash.png -menu color title * #FFFFFFFF * -menu color border * #00000000 #00000000 none -menu color sel * #ffffffff #76a1d0ff * -menu color hotsel 1;7;37;40 #ffffffff #76a1d0ff * -menu color tabmsg * #ffffffff #00000000 * -menu color help 37;40 #ffdddd00 #00000000 none -menu vshift 17 -menu rows 10 -menu helpmsgrow 15 -# The command line must be at least one line from the bottom. -menu cmdlinerow 16 -menu timeoutrow 16 -menu tabmsgrow 18 -menu tabmsg Press ENTER to boot or TAB to edit a menu entry diff --git a/sid-kvm-debian/customization/bootloaders/syslinux/syslinux.cfg b/sid-kvm-debian/customization/bootloaders/syslinux/syslinux.cfg deleted file mode 100644 index cc7827a..0000000 --- a/sid-kvm-debian/customization/bootloaders/syslinux/syslinux.cfg +++ /dev/null @@ -1,4 +0,0 @@ -include menu.cfg -default menu.c32 -prompt 0 -timeout 20 diff --git a/sid-kvm-debian/customization/hooks/01-setup_user_linaro.chroot b/sid-kvm-debian/customization/hooks/01-setup_user_linaro.chroot new file mode 100755 index 0000000..9c65f97 --- /dev/null +++ b/sid-kvm-debian/customization/hooks/01-setup_user_linaro.chroot @@ -0,0 +1,7 @@ +#!/bin/sh + +echo "I: create linaro user" +adduser --gecos linaro --disabled-login linaro + +echo "I: set linaro user password" +echo "linaro:linaro" | chpasswd diff --git a/sid-kvm-debian/customization/includes.chroot/bin/auto-root-login b/sid-kvm-debian/customization/includes.chroot/bin/auto-root-login new file mode 100755 index 0000000..a653e6f --- /dev/null +++ b/sid-kvm-debian/customization/includes.chroot/bin/auto-root-login @@ -0,0 +1,4 @@ +#!/bin/sh + +exec /bin/login -f root + diff --git a/sid-kvm-debian/customization/includes.chroot/bin/auto-serial-console b/sid-kvm-debian/customization/includes.chroot/bin/auto-serial-console new file mode 100755 index 0000000..239f48d --- /dev/null +++ b/sid-kvm-debian/customization/includes.chroot/bin/auto-serial-console @@ -0,0 +1,35 @@ +#!/bin/sh -e + +[ -f /etc/default/autogetty ] && . /etc/default/autogetty + +[ 1 -gt $ENABLED ] && exit + +for arg in $(cat /proc/cmdline) +do + case $arg in + console=*) + tty=${arg#console=} + tty=${tty#/dev/} + + case $tty in + tty[a-zA-Z]* ) + PORT=${tty%%,*} + + # check for service which do something on this port + if [ -f /etc/init/$PORT.conf ];then continue;fi + + tmp=${tty##$PORT,} + SPEED=${tmp%%n*} + BITS=${tmp##${SPEED}n} + + # 8bit serial is default + [ -z $BITS ] && BITS=8 + [ 8 -eq $BITS ] && GETTY_ARGS="$GETTY_ARGS -8 " + + [ -z $SPEED ] && SPEED='115200,57600,38400,19200,9600' + + GETTY_ARGS="$AUTOGETTY_ARGS $GETTY_ARGS $SPEED $PORT" + exec /sbin/getty $GETTY_ARGS + esac + esac +done diff --git a/sid-kvm-debian/customization/includes.chroot/etc/default/autogetty b/sid-kvm-debian/customization/includes.chroot/etc/default/autogetty new file mode 100644 index 0000000..d8b2255 --- /dev/null +++ b/sid-kvm-debian/customization/includes.chroot/etc/default/autogetty @@ -0,0 +1,5 @@ +# here you can provide what to run instead of /bin/login +AUTOGETTY_ARGS="-n -l /bin/auto-root-login" + +# Should autogetty be enabled? +ENABLED=1 diff --git a/sid-kvm-debian/customization/includes.chroot/etc/hostname b/sid-kvm-debian/customization/includes.chroot/etc/hostname new file mode 100644 index 0000000..7bd52bb --- /dev/null +++ b/sid-kvm-debian/customization/includes.chroot/etc/hostname @@ -0,0 +1 @@ +linaro-sid diff --git a/sid-kvm-debian/customization/includes.chroot/etc/hosts b/sid-kvm-debian/customization/includes.chroot/etc/hosts new file mode 100644 index 0000000..c53a094 --- /dev/null +++ b/sid-kvm-debian/customization/includes.chroot/etc/hosts @@ -0,0 +1,7 @@ +127.0.0.1 localhost +::1 localhost ip6-localhost ip6-loopback +fe00::0 ip6-localnet +ff00::0 ip6-mcastprefix +ff02::1 ip6-allnodes +ff02::2 ip6-allrouters +127.0.1.1 linaro-sid diff --git a/sid-kvm-debian/customization/includes.chroot/etc/inittab b/sid-kvm-debian/customization/includes.chroot/etc/inittab new file mode 100644 index 0000000..6b724cf --- /dev/null +++ b/sid-kvm-debian/customization/includes.chroot/etc/inittab @@ -0,0 +1,71 @@ +# /etc/inittab: init(8) configuration. +# $Id: inittab,v 1.91 2002/01/25 13:35:21 miquels Exp $ + +# The default runlevel. +id:2:initdefault: + +# Boot-time system configuration/initialization script. +# This is run first except when booting in emergency (-b) mode. +si::sysinit:/etc/init.d/rcS + +# What to do in single-user mode. +~~:S:wait:/sbin/sulogin + +# /etc/init.d executes the S and K scripts upon change +# of runlevel. +# +# Runlevel 0 is halt. +# Runlevel 1 is single-user. +# Runlevels 2-5 are multi-user. +# Runlevel 6 is reboot. + +l0:0:wait:/etc/init.d/rc 0 +l1:1:wait:/etc/init.d/rc 1 +l2:2:wait:/etc/init.d/rc 2 +l3:3:wait:/etc/init.d/rc 3 +l4:4:wait:/etc/init.d/rc 4 +l5:5:wait:/etc/init.d/rc 5 +l6:6:wait:/etc/init.d/rc 6 +# Normally not reached, but fallthrough in case of emergency. +z6:6:respawn:/sbin/sulogin + +# What to do when CTRL-ALT-DEL is pressed. +ca:12345:ctrlaltdel:/sbin/shutdown -t1 -a -r now + +# Action on special keypress (ALT-UpArrow). +#kb::kbrequest:/bin/echo "Keyboard Request--edit /etc/inittab to let this work." + +# What to do when the power fails/returns. +pf::powerwait:/etc/init.d/powerfail start +pn::powerfailnow:/etc/init.d/powerfail now +po::powerokwait:/etc/init.d/powerfail stop + +# /sbin/getty invocations for the runlevels. +# +# The "id" field MUST be the same as the last +# characters of the device (after "tty"). +# +# Format: +# <id>:<runlevels>:<action>:<process> +# +# Note that on most Debian systems tty7 is used by the X Window System, +# so if you want to add more getty's go ahead but skip tty7 if you run X. +# +1:2345:respawn:/bin/login -f root </dev/tty1 >/dev/tty1 2>&1 +2:23:respawn:/sbin/getty 38400 tty2 +3:23:respawn:/sbin/getty 38400 tty3 +4:23:respawn:/sbin/getty 38400 tty4 +5:23:respawn:/sbin/getty 38400 tty5 +6:23:respawn:/sbin/getty 38400 tty6 + +# Example how to put a getty on a serial line (for a terminal) +# +#T0:23:respawn:/sbin/getty -L ttyS0 9600 vt100 +#T1:23:respawn:/sbin/getty -L ttyS1 9600 vt100 + +T0:23:respawn:/bin/auto-serial-console + +# Example how to put a getty on a modem line. +# +#T3:23:respawn:/sbin/mgetty -x0 -s 57600 ttyS3 + diff --git a/sid-kvm-debian/customization/includes.chroot/etc/network/interfaces b/sid-kvm-debian/customization/includes.chroot/etc/network/interfaces new file mode 100644 index 0000000..13f3827 --- /dev/null +++ b/sid-kvm-debian/customization/includes.chroot/etc/network/interfaces @@ -0,0 +1,10 @@ +# interfaces(5) file used by ifup(8) and ifdown(8) +# Include files from /etc/network/interfaces.d: +source-directory /etc/network/interfaces.d + +# The loopback network interface +auto lo +iface lo inet loopback + +auto eth0 +iface eth0 inet dhcp diff --git a/sid-kvm-debian/lb2img.sh b/sid-kvm-debian/lb2img.sh new file mode 100755 index 0000000..f944708 --- /dev/null +++ b/sid-kvm-debian/lb2img.sh @@ -0,0 +1,76 @@ +#!/bin/sh + +# (C) 2013 Fathi Boudra <fathi.boudra@linaro.org> + +# Convert live-build tarball to KVM image + +PROGNAME=`basename $0` +DEVICE=${DEVICE:-/dev/loop0} +IMAGE=${IMAGE:-kvm.img} + +# we must be root +[ `whoami` = "root" ] || { echo "E: You must be root" && exit 1; } + +# we must have mkfs/tune2fs/qemu-img +MKFS=`which mkfs.ext4` || { echo "E: You must have mkfs.ext3" && exit 1; } +TUNE2FS=`which tune2fs` || { echo "E: You must have tune2fs" && exit 1; } +QEMUIMG=`which qemu-img` || { echo "E: You must have qemu-img" && exit 1; } + +${QEMUIMG} create -f raw ${IMAGE} 1G +losetup ${DEVICE} ${IMAGE} + +echo "I: Create filesystem" +${MKFS} -O ^has_journal ${DEVICE} + +echo "I: Tune filesystem" +${TUNE2FS} -c 0 -i 0 ${DEVICE} + +echo "I: Mount device on local filesystem" +MOUNTDIR=$(mktemp -d /tmp/${PROGNAME}.XXXXXX) +mount ${DEVICE} ${MOUNTDIR} + +tar -zxf binary-tar.tar.gz -C ${MOUNTDIR} --strip-components=1 + +echo "I: Install grub bootloader" +echo "(hd0) ${DEVICE}" > device.map +echo "set prefix=(hd0)/boot/grub" > mycfg.cfg +cp -a /usr/lib/grub/i386-pc/boot.img ${MOUNTDIR}/boot/grub/ +cp -a /usr/lib/grub/i386-pc ${MOUNTDIR}/boot/grub/ + +grub-mkimage \ + --config=mycfg.cfg \ + --directory=/usr/lib/grub/i386-pc \ + --output=${MOUNTDIR}/boot/grub/core.img \ + --format=i386-pc \ + --prefix=/boot \ + biosdisk part_msdos ext2 + +grub-bios-setup \ + --directory=${MOUNTDIR}/boot/grub \ + --force \ + --device-map=device.map \ + ${DEVICE} + +echo "I: Create grub configuration file" +VMLINUZ=`find ${MOUNTDIR}/boot -type f -name 'vmlinuz-*' |xargs basename` +INITRD=`find ${MOUNTDIR}/boot -type f -name 'initrd.img-*' |xargs basename` +UUID=`blkid ${DEVICE} |cut -d' ' -f2 |cut -d'"' -f2` +cat > ${MOUNTDIR}/boot/grub/grub.cfg << EOF +set default=0 +set timeout=2 + +insmod part_msdos +insmod ext2 +set root=(hd0) + +menuentry 'linux' { + linux /boot/${VMLINUZ} root=UUID=${UUID} console=ttyS0,115200 ro quiet + initrd /boot/${INITRD} +} +EOF + +umount ${MOUNTDIR} +rm -rf ${MOUNTDIR} device.map mycfg.cfg +losetup -d ${DEVICE} + +echo "I: Done" |