Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

narcissus: fix distro config selection

  • Loading branch information...
commit 88313dd17ac6aa7c64ff0e47817fa859d25fc369 1 parent d751ce2
@koenkooi koenkooi authored
View
14 index.html
@@ -18,6 +18,12 @@
</div>
<br/><b>Base settings:</b><br/><br/>
<div id="machinedialog" class="nblock">
+ <div id='machinelist'>
+ Select the machine you want to build your rootfs image for:<br/><br/>
+ <select name='machine' onChange='showValues();'>
+ <option value="invalid">invalid</option>
+ </select><br/>
+ </div>
</div>
<div id='imagename' class="nblock">
Choose your image name.<br/><font size="-2">This is used in the filename offered for download, makes it easier to distinguish between rootfs images after downloading.</font><br/><br/>
@@ -37,7 +43,13 @@
<div id="releasedialog" class="nblock">
Select the release you want to base your rootfs image on.<br/><font size="-2">The 'stable' option will give you a working system, but will not have the latest versions of packages. The 'unstable' option will give you access to all the latest packages the developers have uploaded, but is known to break every now and then. The 'next' option will give you the bleeding edge, but it's incomplete and only intended for angstrom developers</font><br/><br/>
- <div id="releaseconfig"></div>
+ <div id="releaseconfig">
+ <div id='configlist'>
+ <select name="configs" onChange='showValues();'>
+ <option value="invalid">invalid</option>
+ </select>
+ </div>
+ </div>
</div>
<div id="basesystemdialog" class="nblock">
Base system<br/> <font size="-2">Each entry down is a superset of the one above it. Busybox will give you only busybox, usefull for e.g. small ramdisks. Task-boot will give you the minimal set of drivers and packages you need to boot. Task-base will give you drivers for non-essential features of your system, e.g. bluetooth. Options below that will include even more drivers for a smoother experience with USB based devices.</font><br/><br/>
View
2  scripts/configure-image.sh
@@ -5,7 +5,7 @@
echo "cleaning up stale files"
find /tmp -name "opkg*" -mtime +2 -exec rm -r {} \;
-find deploy -depth -mindepth 2 -mtime +4 -delete
+#find deploy -depth -mindepth 2 -mtime +4 -delete
MACHINE=$1
IMAGENAME=$2
View
2  scripts/extract-supported-machines.sh
@@ -17,7 +17,7 @@ for machine in $(find conf/ -name "arch.conf" | awk -F/ '{print $2}' | sort | un
echo " <option value=\"$machine\">$machine</option>" >> machine-list.html
echo "<div id='configlist'>" > conf/$machine/config-list.html
- echo " <select name=\"configs\">" >> conf/$machine/config-list.html
+ echo " <select name=\"configs\" onChange='showValues();'>" >> conf/$machine/config-list.html
for config in $(ls conf/$machine/configs/ | sort -r ) ; do
echo " <option value=\"$(basename $config)\">$(basename $config)</option>" >> conf/$machine/config-list.html
done
View
14 scripts/js/narcissus.js
@@ -14,6 +14,8 @@ var FAIL_image = "<img src='img/X_mark.png'>";
var succes_image = "<img src='img/Green_tick.png'>";
var repourl = "http://www.angstrom-distribution.org/repo/?pkgname=";
+var machinename = "";
+
//var workerurl = 'http://dominion.thruhere.net/koen/narcissus/backend.php';
//var workerurl = 'http://amethyst.openembedded.net/~koen/narcissus/backend.php';
var workerurl = "backend.php";
@@ -83,7 +85,6 @@ function unique(a)
function showValues() {
var extratext = "";
- var machinename = "";
var fields = $(":input").serializeArray();
$("#results").empty();
$("#additional_packages").empty();
@@ -91,9 +92,13 @@ function showValues() {
switch(field.name) {
case 'machine':
- machinename = field.value;
- $("#results").append("Machine: " + field.value + "<br/>");
- $('#releaseconfig').load('conf/' + machinename + '/config-list.html #configlist');
+ if(field.value != "invalid") {
+ if(machinename != field.value) {
+ machinename = field.value;
+ $('#releaseconfig').load('conf/' + machinename + '/config-list.html #configlist');
+ }
+ $("#results").append("Machine: " + field.value + "<br/>");
+ }
break;
case 'name':
$("#results").append("Image name: " + field.value + "<br/>");
@@ -103,6 +108,7 @@ function showValues() {
case 'devmanager':
break;
case 'configs':
+ //if(field.value != "invalid") $("#results").append("Configs:" + field.value + "<br/> ");
break;
case 'imagetype':
$("#results").append("Image type: " + field.value + "<br/> ");
Please sign in to comment.
Something went wrong with that request. Please try again.