You can subscribe to this list here.
2003 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(23) |
Nov
(20) |
Dec
(32) |
---|---|---|---|---|---|---|---|---|---|---|---|---|
2004 |
Jan
(43) |
Feb
(31) |
Mar
(99) |
Apr
(57) |
May
(82) |
Jun
(73) |
Jul
(123) |
Aug
(634) |
Sep
(588) |
Oct
(264) |
Nov
(217) |
Dec
(179) |
2005 |
Jan
(262) |
Feb
(273) |
Mar
(164) |
Apr
(88) |
May
(23) |
Jun
(10) |
Jul
(8) |
Aug
(19) |
Sep
(112) |
Oct
(57) |
Nov
(71) |
Dec
(6) |
2006 |
Jan
(14) |
Feb
(48) |
Mar
(56) |
Apr
(21) |
May
(77) |
Jun
(46) |
Jul
(47) |
Aug
(27) |
Sep
(18) |
Oct
(16) |
Nov
(4) |
Dec
(18) |
2007 |
Jan
(2) |
Feb
(6) |
Mar
(2) |
Apr
(27) |
May
(13) |
Jun
(27) |
Jul
(20) |
Aug
(3) |
Sep
(3) |
Oct
(23) |
Nov
(21) |
Dec
(6) |
2008 |
Jan
(7) |
Feb
(3) |
Mar
(4) |
Apr
(8) |
May
(3) |
Jun
(4) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
2009 |
Jan
(11) |
Feb
(1) |
Mar
(8) |
Apr
|
May
|
Jun
(4) |
Jul
(6) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(1) |
From: <aq...@us...> - 2009-07-10 13:25:01
|
Revision: 2666 http://morphix.svn.sourceforge.net/morphix/?rev=2666&view=rev Author: aquatix Date: 2009-07-10 13:24:56 +0000 (Fri, 10 Jul 2009) Log Message: ----------- Fixed calling of non-existing ntpdate in /etc/init.d/ Replaced by call to ntp. Thanks Thanatermesis for reporting and suggesting the fix Modified Paths: -------------- trunk/datetimeconf/src/libdatetime.c Modified: trunk/datetimeconf/src/libdatetime.c =================================================================== --- trunk/datetimeconf/src/libdatetime.c 2009-07-01 21:33:38 UTC (rev 2665) +++ trunk/datetimeconf/src/libdatetime.c 2009-07-10 13:24:56 UTC (rev 2666) @@ -46,7 +46,7 @@ } gboolean check_ntp_installed() { - FILE *fp = fopen("/etc/init.d/ntpdate","r"); + FILE *fp = fopen("/etc/init.d/ntp","r"); if (fp == NULL) { return NULL; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <bms...@us...> - 2009-07-01 21:33:39
|
Revision: 2665 http://morphix.svn.sourceforge.net/morphix/?rev=2665&view=rev Author: bmsleight Date: 2009-07-01 21:33:38 +0000 (Wed, 01 Jul 2009) Log Message: ----------- Tweak. Modified Paths: -------------- trunk/mmaker/utils/autotesting2/debian/rules Modified: trunk/mmaker/utils/autotesting2/debian/rules =================================================================== --- trunk/mmaker/utils/autotesting2/debian/rules 2009-07-01 21:17:14 UTC (rev 2664) +++ trunk/mmaker/utils/autotesting2/debian/rules 2009-07-01 21:33:38 UTC (rev 2665) @@ -74,7 +74,7 @@ # dh_installinit # dh_installcron # dh_installinfo - dh_installman + dh_installman -p autotesting debian/manpage.1 dh_link dh_strip dh_compress This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <bms...@us...> - 2009-07-01 21:17:18
|
Revision: 2664 http://morphix.svn.sourceforge.net/morphix/?rev=2664&view=rev Author: bmsleight Date: 2009-07-01 21:17:14 +0000 (Wed, 01 Jul 2009) Log Message: ----------- Tweak. Modified Paths: -------------- trunk/mmaker/utils/autotesting2/autotesting.py Modified: trunk/mmaker/utils/autotesting2/autotesting.py =================================================================== --- trunk/mmaker/utils/autotesting2/autotesting.py 2009-07-01 21:10:02 UTC (rev 2663) +++ trunk/mmaker/utils/autotesting2/autotesting.py 2009-07-01 21:17:14 UTC (rev 2664) @@ -1,3 +1,4 @@ +#!/usr/bin/python # -*- coding: utf-8 -*- # # autotesting - automatically test by video qemu booting. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <bms...@us...> - 2009-07-01 21:10:12
|
Revision: 2663 http://morphix.svn.sourceforge.net/morphix/?rev=2663&view=rev Author: bmsleight Date: 2009-07-01 21:10:02 +0000 (Wed, 01 Jul 2009) Log Message: ----------- Adding package information for autotesting - tweak. Modified Paths: -------------- trunk/mmaker/utils/autotesting2/Makefile trunk/mmaker/utils/autotesting2/debian/rules Modified: trunk/mmaker/utils/autotesting2/Makefile =================================================================== --- trunk/mmaker/utils/autotesting2/Makefile 2009-07-01 20:58:08 UTC (rev 2662) +++ trunk/mmaker/utils/autotesting2/Makefile 2009-07-01 21:10:02 UTC (rev 2663) @@ -10,6 +10,8 @@ cp ./README $(DESTDIR)/usr/share/autotesting/README mkdir -p $(DESTDIR)/usr/share/autotesting/tests cp -r ./tests/* $(DESTDIR)/usr/share/autotesting/tests/ + +clean: remove: rm $(DESTDIR)/usr/bin/autotesting Modified: trunk/mmaker/utils/autotesting2/debian/rules =================================================================== --- trunk/mmaker/utils/autotesting2/debian/rules 2009-07-01 20:58:08 UTC (rev 2662) +++ trunk/mmaker/utils/autotesting2/debian/rules 2009-07-01 21:10:02 UTC (rev 2663) @@ -27,7 +27,7 @@ dh_testdir # Add here commands to compile the package. - $(MAKE) + # $(MAKE) #docbook-to-man debian/autotesting.sgml > autotesting.1 touch $@ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <bms...@us...> - 2009-07-01 20:58:09
|
Revision: 2662 http://morphix.svn.sourceforge.net/morphix/?rev=2662&view=rev Author: bmsleight Date: 2009-07-01 20:58:08 +0000 (Wed, 01 Jul 2009) Log Message: ----------- Adding package information for autotesting Added Paths: ----------- trunk/mmaker/utils/autotesting2/Makefile trunk/mmaker/utils/autotesting2/debian/ trunk/mmaker/utils/autotesting2/debian/changelog trunk/mmaker/utils/autotesting2/debian/compat trunk/mmaker/utils/autotesting2/debian/control trunk/mmaker/utils/autotesting2/debian/copyright trunk/mmaker/utils/autotesting2/debian/dirs trunk/mmaker/utils/autotesting2/debian/docs trunk/mmaker/utils/autotesting2/debian/manpage.1 trunk/mmaker/utils/autotesting2/debian/rules Added: trunk/mmaker/utils/autotesting2/Makefile =================================================================== --- trunk/mmaker/utils/autotesting2/Makefile (rev 0) +++ trunk/mmaker/utils/autotesting2/Makefile 2009-07-01 20:58:08 UTC (rev 2662) @@ -0,0 +1,16 @@ +all: install + +install: autotesting + +autotesting: + mkdir -p $(DESTDIR)/usr/bin + cp ./autotesting.py $(DESTDIR)/usr/bin/autotesting + chmod a+x $(DESTDIR)/usr/bin/autotesting + mkdir -p $(DESTDIR)/usr/share/autotesting + cp ./README $(DESTDIR)/usr/share/autotesting/README + mkdir -p $(DESTDIR)/usr/share/autotesting/tests + cp -r ./tests/* $(DESTDIR)/usr/share/autotesting/tests/ + +remove: + rm $(DESTDIR)/usr/bin/autotesting + rm -r $(DESTDIR)/usr/share/autotesting Added: trunk/mmaker/utils/autotesting2/debian/changelog =================================================================== --- trunk/mmaker/utils/autotesting2/debian/changelog (rev 0) +++ trunk/mmaker/utils/autotesting2/debian/changelog 2009-07-01 20:58:08 UTC (rev 2662) @@ -0,0 +1,6 @@ +autotesting (0.0.1-1) unstable; urgency=low + + * Initial release + + -- Brendan M. Sleight <bm...@ba...> Wed, 01 Jul 2009 21:03:14 +0100 + Added: trunk/mmaker/utils/autotesting2/debian/compat =================================================================== --- trunk/mmaker/utils/autotesting2/debian/compat (rev 0) +++ trunk/mmaker/utils/autotesting2/debian/compat 2009-07-01 20:58:08 UTC (rev 2662) @@ -0,0 +1 @@ +7 Added: trunk/mmaker/utils/autotesting2/debian/control =================================================================== --- trunk/mmaker/utils/autotesting2/debian/control (rev 0) +++ trunk/mmaker/utils/autotesting2/debian/control 2009-07-01 20:58:08 UTC (rev 2662) @@ -0,0 +1,14 @@ +Source: autotesting +Section: unknown +Priority: optional +Maintainer: Brendan M. Sleight <bm...@ba...> +Build-Depends: debhelper (>= 7) +Standards-Version: 3.7.3 +Homepage: <insert the upstream URL, if relevant> + +Package: autotesting +Architecture: any +Depends: python, python-amara, wget, Xvfb, xloadimage, qemu, recordmydesktop, ffmpeg, imagemagick, gmessage +Description: automatically test by video qemu booting + autotesting is a script which records qemu booting. Designed to be run + as a cron job. Mainly used for testing liveCD images. Added: trunk/mmaker/utils/autotesting2/debian/copyright =================================================================== --- trunk/mmaker/utils/autotesting2/debian/copyright (rev 0) +++ trunk/mmaker/utils/autotesting2/debian/copyright 2009-07-01 20:58:08 UTC (rev 2662) @@ -0,0 +1,38 @@ +This package was debianized by Brendan M. Sleight <bm...@ba...> on +Wed, 01 Jul 2009 21:03:14 +0100. + +It was downloaded from debian-live repositories + +Upstream Author(s): + + Brendan M. Sleight <bm...@ba...> + +Copyright: + + <Copyright (C) 2009 Brendan M. Sleight > + +License: + + This package is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This package is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this package; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +On Debian systems, the complete text of the GNU General +Public License can be found in `/usr/share/common-licenses/GPL'. + +The Debian packaging is (C) 2009, Brendan M. Sleight <bm...@ba...> and +is licensed under the GPL, see above. + + +# Please also look if there are files or directories which have a +# different copyright/license attached and list them here. Added: trunk/mmaker/utils/autotesting2/debian/dirs =================================================================== --- trunk/mmaker/utils/autotesting2/debian/dirs (rev 0) +++ trunk/mmaker/utils/autotesting2/debian/dirs 2009-07-01 20:58:08 UTC (rev 2662) @@ -0,0 +1,4 @@ +usr/bin +usr/share/autotesting +usr/share/autotesting/tests + Added: trunk/mmaker/utils/autotesting2/debian/docs =================================================================== --- trunk/mmaker/utils/autotesting2/debian/docs (rev 0) +++ trunk/mmaker/utils/autotesting2/debian/docs 2009-07-01 20:58:08 UTC (rev 2662) @@ -0,0 +1 @@ +README Added: trunk/mmaker/utils/autotesting2/debian/manpage.1 =================================================================== --- trunk/mmaker/utils/autotesting2/debian/manpage.1 (rev 0) +++ trunk/mmaker/utils/autotesting2/debian/manpage.1 2009-07-01 20:58:08 UTC (rev 2662) @@ -0,0 +1,48 @@ +.\" Hey, EMACS: -*- nroff -*- +.\" First parameter, NAME, should be all caps +.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection +.\" other parameters are allowed: see man(7), man(1) +.TH AUTOTESTING SECTION "July 1, 2009" +.\" Please adjust this date whenever revising the manpage. +.\" +.\" Some roff macros, for reference: +.\" .nh disable hyphenation +.\" .hy enable hyphenation +.\" .ad l left justify +.\" .ad b justify to both left and right margins +.\" .nf disable filling +.\" .fi enable filling +.\" .br insert line break +.\" .sp <n> insert n+1 empty lines +.\" for manpage-specific macros, see man(7) +.SH NAME +autotesting \- automatically test by video qemu booting +.SH SYNOPSIS +.B autotesting +.RI [ options ] " files" ... +.br +.SH DESCRIPTION +This manual page documents briefly the +.B autotesting. +.PP +.\" TeX users may be more comfortable with the \fB<whatever>\fP and +.\" \fI<whatever>\fP escape sequences to invode bold face and italics, +.\" respectively. +\fBautotesting\fP is a script which records qemu booting. Designed to be run as a cron job. Mainly used for testing liveCD images. +.SH OPTIONS +These programs follow the usual GNU command line syntax, with long +options starting with two dashes (`-'). +A summary of options is included below. +For a complete description, see the Info files. +.TP +.B \-t, \-\-tests=TESTS.XML +Run the tests defined in TESTS.XML. +.TP +.B \-v, \-\-version +Show version of program. +.br +.SH AUTHOR +autotesting was written by Brendan M. Sleight. +.PP +This manual page was written by Brendan M. Sleight <bm...@ba...>, +for the Debian project (but may be used by others). Added: trunk/mmaker/utils/autotesting2/debian/rules =================================================================== --- trunk/mmaker/utils/autotesting2/debian/rules (rev 0) +++ trunk/mmaker/utils/autotesting2/debian/rules 2009-07-01 20:58:08 UTC (rev 2662) @@ -0,0 +1,91 @@ +#!/usr/bin/make -f +# -*- makefile -*- +# Sample debian/rules that uses debhelper. +# This file was originally written by Joey Hess and Craig Small. +# As a special exception, when this file is copied by dh-make into a +# dh-make output file, you may use that output file without restriction. +# This special exception was added by Craig Small in version 0.37 of dh-make. + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + + + + + +configure: configure-stamp +configure-stamp: + dh_testdir + # Add here commands to configure the package. + + touch configure-stamp + + +build: build-stamp + +build-stamp: configure-stamp + dh_testdir + + # Add here commands to compile the package. + $(MAKE) + #docbook-to-man debian/autotesting.sgml > autotesting.1 + + touch $@ + +clean: + dh_testdir + dh_testroot + rm -f build-stamp configure-stamp + + # Add here commands to clean up after the build process. + $(MAKE) clean + + dh_clean + +install: build + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs + + # Add here commands to install the package into debian/autotesting. + $(MAKE) DESTDIR=$(CURDIR)/debian/autotesting install + + +# Build architecture-independent files here. +binary-indep: build install +# We have nothing to do by default. + +# Build architecture-dependent files here. +binary-arch: build install + dh_testdir + dh_testroot + dh_installchangelogs + dh_installdocs + dh_installexamples +# dh_install +# dh_installmenu +# dh_installdebconf +# dh_installlogrotate +# dh_installemacsen +# dh_installpam +# dh_installmime +# dh_python +# dh_installinit +# dh_installcron +# dh_installinfo + dh_installman + dh_link + dh_strip + dh_compress + dh_fixperms +# dh_perl +# dh_makeshlibs + dh_installdeb + dh_shlibdeps + dh_gencontrol + dh_md5sums + dh_builddeb + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary install configure Property changes on: trunk/mmaker/utils/autotesting2/debian/rules ___________________________________________________________________ Added: svn:executable + * This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <bms...@us...> - 2009-07-01 19:25:08
|
Revision: 2661 http://morphix.svn.sourceforge.net/morphix/?rev=2661&view=rev Author: bmsleight Date: 2009-07-01 19:24:57 +0000 (Wed, 01 Jul 2009) Log Message: ----------- Adding Autotesting2. Python, xml and joy Added Paths: ----------- trunk/mmaker/utils/autotesting2/ trunk/mmaker/utils/autotesting2/README trunk/mmaker/utils/autotesting2/autotesting.py trunk/mmaker/utils/autotesting2/tests/ trunk/mmaker/utils/autotesting2/tests/local-test_morphix-lightgui.xml trunk/mmaker/utils/autotesting2/tests/morphix-lightgui.xml Added: trunk/mmaker/utils/autotesting2/README =================================================================== --- trunk/mmaker/utils/autotesting2/README (rev 0) +++ trunk/mmaker/utils/autotesting2/README 2009-07-01 19:24:57 UTC (rev 2661) @@ -0,0 +1,99 @@ +AUTOTESTING README +================== + +autotesting --tests=TESTS.XML + +This readme outlines the different tags used in TESTS.XML. + +EXAMPLE TESTS.XML +================= + +<autotesting> + </tests> + <test> + <download>http://127.0.0.1/autotesting/debian-live-501-i386-xfce-desktop.iso</download> + <title>Debian Live (xfce)</title> + <description>Debian Live. Daily build of squeeze xfce iso.</description> + <background>http://git.debian.org/?p=debian-live/homepage.git;a=blob_plain;f=images/debian-live.png</background> + <frequency>daily</frequency> + <qemu> + <xscreen>800x600x24</xscreen> + <binary>qemu</binary> + <options>-cdrom</options> + <pause>10</pause> + <sendkeys>kp_enter</sendkeys> + <!-- Time to run qmeu --> + <time>600</time> + </qemu> + <output> + <!-- Number of test sets to keep --> + <keep>4</keep> + <root>/home/bms/autotesting/tests/</root> + <local>example-live/squeeze/xfce/</local> + <video>autotesting.ogv</video> + <screenshots> + <final>final-screenshot.png</final> + <montage>montage-of-video-frames.png</montage> + </screenshots> + </output> + </test> + </tests> +</autotesting> + + +LOOKING AT EACH TAG +=================== + +<download>http://127.0.0.1/autotesting/debian-live-501-i386-xfce-desktop.iso</download> +The location of the image to be tested. This can be an iso or an USB image (img) or in fact anything that can be booted with qemu. + +<title>Debian Live (xfce)</title> +<description>Debian Live. Daily build of squeeze xfce iso.</description> +The title and description tags are used in the opening titles of the video and also useful when scanning a long tests.xml file. + +<background>http://git.debian.org/?p=debian-live/homepage.git;a=blob_plain;f=images/debian-live.png</background> +The location of the background graphic used in the video. + +<frequency>daily</frequency> +This can be daily, weekly or monthly. Daily, means that the test will be run every time. Weekly - the test will only be done if the current day is a Sunday. Monthly - the test will only be done on the 1st day of a month, + +<xscreen>800x600x24</xscreen> +The width, height and colour depth of the xserver (Xvfb) in which to run qemu. Not at the minimum dimensions required for qemu are 800x600. + +<binary>qemu</binary> +The qemu binary. This could be for example qemu-ppc64 or qemu-arm, to test images for different architectures. + +<options>-cdrom</options> +The option to pass to qemu in conjunction with the image we are testing. In this example we are testing a iso, so we need the "-cdrom" option. For an img file you would use -hda. + +<pause>10</pause> +Time to pause before sending keys presses. + +<sendkeys>kp_enter</sendkeys> +Some iso and img require some user interaction to star the booting, normally just a enter being pressed. Useful for selecting different options from the grub menu. Use the qmeu sendkey command, send "kp_enter" - a keypad enter. To send multiple key presses, use a comma separated list. <sendkeys>down,down,kp_enter</sendkeys>. + +<time>600</time> +Let qemu run for 600 seconds. + +<keep>4</keep> +Number of test sets to keep. If frequency is weekly, and keep is 4, then any test set older than 4 weeks will be deleted. + +<root>/home/bms/autotesting/tests/</root> +<local>example-live/squeeze/xfce/</local> +A new directory will be created at /root/prefix/DATE/, in this example /home/bms/autotesting/tests/example-live/squeeze/xfce/2009-07-01/ and the output files will be stored in this directory. Another directory /root/current/prefix/ will be created, with symlinks to the latest output files, e.g. /home/bms/autotesting/tests/current/example-live/squeeze/xfce/. + +<video>autotesting.ogv</video> +The output video file stored in the output directories (see <root> and <local>). File is a theora video, created by the wonderful application - recordmydeskptop. + +<final>final-screenshot.png</final> +<montage>montage-of-video-frames.png</montage> +The output file names stored in the output directories (see <root> and <local>) of a final screenshot of qemu and a montage of frames from the video. These can give a good idea of how successful the test was rather than viewing the whole video. + + +REQUIRED APPLICATIONS +===================== + +I will be trying to package autotesting - however for reference this following applications are required:- + +python, python-amara, wget, Xvfb, xloadimage, qemu, recordmydesktop, ffmpeg, imagemagick, gmessage + Added: trunk/mmaker/utils/autotesting2/autotesting.py =================================================================== --- trunk/mmaker/utils/autotesting2/autotesting.py (rev 0) +++ trunk/mmaker/utils/autotesting2/autotesting.py 2009-07-01 19:24:57 UTC (rev 2661) @@ -0,0 +1,284 @@ +# -*- coding: utf-8 -*- +# +# autotesting - automatically test by video qemu booting. +# Copyright (C) Brendan M. Sleight, et al. <bm...@ba...> +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. + + +from optparse import OptionParser +import amara, datetime, os, shutil, subprocess, telnetlib, tempfile, time + +def displayNumber(): + """Really a global we can change later to something better. + like automaticaly get the next free display number. """ + return ":8" + +def log(message): + """ Print [date] message """ + now = datetime.datetime.now() + print "[" + str(now) + "] " + str(message) + +def cronCheak(frequency): + """Check if the frequency (e.g. daily, weekly, mounthly is due to + be run at this time + returns boolean. + """ + now = datetime.datetime.now() + if frequency == "Daily" or frequency == "daily": + return True + elif frequency == "Weekly" or frequency == "weekly": + if now.weekday() == 0: + return True + elif frequency == "Monthly" or frequency == "monthly": + if now.day == 1: + return True + return False + +def dateBasedOnFrequency(frequency, keep): + now = datetime.datetime.now() + if frequency == "Daily" or frequency == "daily": + days=1 + elif frequency == "Weekly" or frequency == "weekly": + days=7 + elif frequency == "Monthly" or frequency == "monthly": + # No date delta of month so near enough ... + days=30 + old = now - datetime.timedelta(days=days*keep) + return old + +def parseTest(xml): + """ Get the xml file and load as a object usign amara + returns amaraObject""" + tests = amara.parse(xml) + return tests.autotesting.tests + +def wget(url): + """ Use wget to download a file + return fileObject""" + log("Downloading " + url) + tmpFile = tempfile.NamedTemporaryFile(prefix="autotesting_wget_") + L = ['wget', '-nv', str(url), '-O', tmpFile.name] + # Maybe do something with the retcode in the future. + retcode = subprocess.call(L) + return tmpFile + +def getDownloads(downloadURL, backgroundURL): + """ Create two temp files and download the main downlaod and + the background + return tempfile, tempfile""" + background = wget(str(backgroundURL)) + download = wget(str(downloadURL)) + return download, background + +def authorityFile(): + """ Return a file containing "localhost" + """ + authority = tempfile.NamedTemporaryFile(prefix="autotesting_authority_") + authority.write("localhost\n") + authority.close() + return authority + +def startXvfb(display, xscreen, background): + """Start a Xvfb instance. The host display for qemu to run inside. + then set the background image. Return ths PID of Xvfb + return interger""" + log("Starting Xvfb") + authority = authorityFile() + xvfbCommand = ["Xvfb", display, "-auth", authority.name, "-screen", "0", xscreen] + xvfb = subprocess.Popen(xvfbCommand) + log("Setting Xvfb background") + xloadimage = ["xloadimage", "-display", display, "-onroot", "-fullscreen", background] + retcode = subprocess.call(xloadimage) + return xvfb + +def waitUntilEncodingFinished(recordMyDesktop): + log("Waiting for recordmydesktop encoding to finish") + while recordMyDesktop.poll()!=0: + print ".. ", + time.sleep(1) + print " " + +def kill(process, message): + log(message) + kill = ["kill", str(process.pid)] + retcode = subprocess.call(kill) + +def startRecordMyDesktop(display): + log("Starting Record My Desktop") + video = tempfile.NamedTemporaryFile(prefix="autotesting_video_", suffix=".ogv") + recordmydesktopCommand = ["recordmydesktop", "--no-cursor", "-display", + display ,"--no-sound", "--overwrite", "-o" ,video.name] + recordmydesktop = subprocess.Popen(recordmydesktopCommand) + return recordmydesktop, video + +def xmessage(display, title, message, time, font): + xloadimage = ["gmessage", "-display", display, "-timeout", time, + "-font", font, "-button", "", "-title", title, + "-center", "\n" + message] + retcode = subprocess.call(xloadimage) + +def openingTitles(display, test): + log("Showing Opening Titles") + time.sleep(2) + xmessage(display, str(test.title), "Autotesting of: " + str(test.title), "3", "monospace 14") + xmessage(display, str(test.title), str(test.description), "3", "monospace 12") + xmessage(display, str(test.title), "Created at " + str(datetime.datetime.now()), "2", "monospace 10") + +def runningQemu(display, test, qemuDownload): + """ Start qemu running, with a local telnet port at 55555 listening acting as the qemu monitor + returns subprocess.process""" + telnet = ("127.0.0.1", "55555") + address, port = telnet + monitor = "telnet:" + address + ":" + port + ",server,nowait" + qemuBinary = str(test.qemu.binary) + log("Starting " + qemuBinary) + if not qemuBinary.startswith("qemu"): + log("WARNING! : " + qemuBinary + " does not start with qemu, using qemu instead.") + qemuBinary = "qemu" + qemuCommand = [qemuBinary, "-monitor", monitor, "-full-screen", str(test.qemu.options), str(qemuDownload)] + qemu = subprocess.Popen(qemuCommand, env={"DISPLAY": display}) + sendkeysToQemu(test, telnet) + log("Running qemu for " + str(test.qemu.time) + " seconds") + time.sleep(int(str(test.qemu.time))) + return qemu + +def sendkeysToQemu(test, telnet): + """Using telnet to send commands to qemu monitor + """ + address, port = telnet + log("Sending keys after pause of " + str(test.qemu.pause) + " seconds") + time.sleep(int(str(test.qemu.pause))) + tn = telnetlib.Telnet(address, port) + sendkeys = str(test.qemu.sendkeys) + for key in sendkeys.split(','): + log("qemu sendkey " + key) + tn.write("sendkey " + key + "\n") + time.sleep(1) + + +def captureScreenshot(display): + """ Capture screen shot on display + return fileObject""" + log("Capture screenshot") + finalImage = tempfile.NamedTemporaryFile(prefix="autotesting_video_", suffix=".png") + captureCommand = ["import", "-display", display, "-window", "root", finalImage.name] + retcode = subprocess.call(captureCommand) + return finalImage + +def createMontage(video, test): + """ Make 16 frames of the video at 1/16, 2/16, 3/16 .... 16/16 of + way through the video. The make a montage of these frames in to + one image. + return fileObject""" + log("Creating Montage") + montage = tempfile.NamedTemporaryFile(prefix="autotesting_video_", suffix=".png") + videoLength = int(str(test.qemu.pause)) + int(str(test.qemu.time)) + # Time for opening titles + videoLength = videoLength + 2 + 3 + 3 + 2 + listFrames = [] + listFramesNames = [] + for count in range(16): + ss = 0.0625 * count * videoLength + frame = tempfile.NamedTemporaryFile(prefix="autotesting_frame_", suffix=".jpg") + frameName = frame.name + "%d.jpg" + frameNameOut = frame.name + "1.jpg" + ffmpeg = ["ffmpeg", "-i", video.name, "-an", "-ss", str(ss), "-t", + "01", "-r", "1", "-y", frameName] + retcode = subprocess.call(ffmpeg) + shutil.move(frameNameOut, frame.name) + listFramesNames.append(frame.name) + listFrames.append(frame) + montageCommand = ["montage", "-geometry", "180x135+4+4", "-frame", "5"] + for frame in listFramesNames: + montageCommand.append(frame) + montageCommand.append(montage.name) + retcode = subprocess.call(montageCommand) + return montage + +def storeFile(tmpFile, copyLocation, symLocation): + shutil.copyfile(tmpFile, copyLocation) + try: + os.remove(symLocation) + except: + pass + os.symlink(copyLocation, symLocation) + +def fileOutputs(test, video, finalImage, montage): + """ Move files to the correct place (as per XML tags) + including symlinks to current. + """ + log("Moving files to the correct place.") + root=str(test.output.root) + local=str(test.output.local) + today=str(datetime.date.today()) + mainDir = root + "/" + local + "/" + today + "/" + dateDirs = root + "/" + local + "/" + currentDir = root + "/current/" + local + "/" + try: + os.makedirs(mainDir) + except: + pass + try: + os.makedirs(currentDir) + except: + pass + storeFile(video.name, mainDir + str(test.output.video), + currentDir + str(test.output.video)) + storeFile(finalImage.name, mainDir + str(test.output.screenshots.final), + currentDir + str(test.output.screenshots.final)) + storeFile(montage.name, mainDir + str(test.output.screenshots.montage), + currentDir + str(test.output.screenshots.montage)) + keepDate = dateBasedOnFrequency(str(test.frequency), int(str(test.output.keep))) + log("Removing old Autotesting output before " + keepDate.strftime("%A %B %d %I:%M:%S %p %Y")) + for f in os.listdir(dateDirs): + fp = dateDirs + f + if (time.mktime(keepDate.timetuple()) - os.path.getmtime(fp) ) > 0: + # Remove the old file + shutil.rmtree(fp) + log("Removing - " + fp) + +def main(): + usage = "usage: %prog [options] --tests=TESTS.XML \n %prog --help for all options" + parser = OptionParser(usage, version="%prog ") + parser.add_option("-t", "--tests", dest="tests", + help="complete the autotesting definined in the xml template") + (options, args) = parser.parse_args() + if not options.tests : + parser.error("Must pass a list of tests to complete.") + + # Main loop + display = displayNumber() + tests = parseTest(options.tests) + for test in tests.test: + if cronCheak(str(test.frequency)): + log("Starting Autotesting of: " + str(test.title)) + (download, background) = getDownloads(str(test.download), str(test.background)) + xvfb = startXvfb(display, str(test.qemu.xscreen), background.name) + (recordMyDesktop, video) = startRecordMyDesktop(display) + openingTitles(display, test) + qemu = runningQemu(display, test, download.name) + finalImage = captureScreenshot(display) + kill(qemu, "Killing qemu") + kill(recordMyDesktop, "Killing recordmysdesktop") + waitUntilEncodingFinished(recordMyDesktop) + kill(xvfb, "Killing Xvfb") + # Put video, montage in right place remvoe old versions etc. + montage = createMontage(video, test) + fileOutputs(test, video, finalImage, montage) + log("Finished Autotesting of: " + str(test.title)) + log("*****************************") + +if __name__ == "__main__": + main() Added: trunk/mmaker/utils/autotesting2/tests/local-test_morphix-lightgui.xml =================================================================== --- trunk/mmaker/utils/autotesting2/tests/local-test_morphix-lightgui.xml (rev 0) +++ trunk/mmaker/utils/autotesting2/tests/local-test_morphix-lightgui.xml 2009-07-01 19:24:57 UTC (rev 2661) @@ -0,0 +1,32 @@ +<autotesting> + <tests> + <test> + <download>http://127.0.0.1/autotesting/lightgui-basemod-2.6.23-2008-02-10_0018-latest.iso</download> + <title>Morphix LightGUI</title> + <description>Morphix. Daily build of LightGUI iso.</description> + <background>http://www.morphix.org/templates/MorphixORG/images/mambo_header.jpg</background> + <frequency>daily</frequency> + <qemu> + <xscreen>800x600x24</xscreen> + <binary>qemu</binary> + <options>-cdrom</options> + <!-- Time to pause before sending keys presses --> + <pause>10</pause> + <sendkeys>down,down,kp_enter</sendkeys> + <!-- Time to run qmeu --> + <time>600</time> + </qemu> + <output> + <!-- Number of test sets to keep --> + <keep>4</keep> + <root>/home/bms/autotesting/tests/</root> + <local>morphix/lightGUI/</local> + <video>autotesting.ogv</video> + <screenshots> + <final>final-screenshot.png</final> + <montage>montage-of-video-frames.png</montage> + </screenshots> + </output> + </test> + </tests> +</autotesting> Added: trunk/mmaker/utils/autotesting2/tests/morphix-lightgui.xml =================================================================== --- trunk/mmaker/utils/autotesting2/tests/morphix-lightgui.xml (rev 0) +++ trunk/mmaker/utils/autotesting2/tests/morphix-lightgui.xml 2009-07-01 19:24:57 UTC (rev 2661) @@ -0,0 +1,32 @@ +<autotesting> + <tests> + <test> + <download>http://distro.ibiblio.org/pub/linux/distributions/morphix/autobuilds/iso/lightgui-basemod-2.6.23-2008-02-10_0018-latest.iso</download> + <title>Morphix LightGUI</title> + <description>Morphix. Daily build of LightGUI iso.</description> + <background>http://www.morphix.org/templates/MorphixORG/images/mambo_header.jpg</background> + <frequency>daily</frequency> + <qemu> + <xscreen>800x600x24</xscreen> + <binary>qemu</binary> + <options>-cdrom</options> + <!-- Time to pause before sending keys presses --> + <pause>10</pause> + <sendkeys>down,down,kp_enter</sendkeys> + <!-- Time to run qmeu --> + <time>600</time> + </qemu> + <output> + <!-- Number of test sets to keep --> + <keep>4</keep> + <root>/home/bms/autotesting/tests/</root> + <local>morphix/lightGUI/</local> + <video>autotesting.ogv</video> + <screenshots> + <final>final-screenshot.png</final> + <montage>montage-of-video-frames.png</montage> + </screenshots> + </output> + </test> + </tests> +</autotesting> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ale...@us...> - 2009-06-19 13:01:34
|
Revision: 2659 http://morphix.svn.sourceforge.net/morphix/?rev=2659&view=rev Author: alextreme Date: 2009-06-19 12:37:43 +0000 (Fri, 19 Jun 2009) Log Message: ----------- * typo Modified Paths: -------------- trunk/mmaker/libmorphix/makemodule.c Modified: trunk/mmaker/libmorphix/makemodule.c =================================================================== --- trunk/mmaker/libmorphix/makemodule.c 2009-06-19 12:32:24 UTC (rev 2658) +++ trunk/mmaker/libmorphix/makemodule.c 2009-06-19 12:37:43 UTC (rev 2659) @@ -1133,7 +1133,7 @@ arch = g_strdup_printf("--arch %s",module->arch); } - cmdline = g_strdup_printf("%s p --allow-unauthenticated %s %s %s %s",P_DEBOOTSTRAP,arch,module->suite,module->dirname,temp->name); + cmdline = g_strdup_printf("%s --allow-unauthenticated %s %s %s %s",P_DEBOOTSTRAP,arch,module->suite,module->dirname,temp->name); g_free(arch); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ale...@us...> - 2009-06-19 13:01:32
|
Revision: 2660 http://morphix.svn.sourceforge.net/morphix/?rev=2660&view=rev Author: alextreme Date: 2009-06-19 12:44:27 +0000 (Fri, 19 Jun 2009) Log Message: ----------- * bump #2 Modified Paths: -------------- trunk/mmaker/debian/changelog Modified: trunk/mmaker/debian/changelog =================================================================== --- trunk/mmaker/debian/changelog 2009-06-19 12:37:43 UTC (rev 2659) +++ trunk/mmaker/debian/changelog 2009-06-19 12:44:27 UTC (rev 2660) @@ -1,3 +1,9 @@ +morphix-mmaker (0.4-49) unstable; urgency=low + + * typo + + -- Alex de Landgraaf <al...@de...> Fri, 19 Jun 2009 14:38:03 +0200 + morphix-mmaker (0.4-48) unstable; urgency=low * allowing debootstrap to continue with unauthenticated repositories This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ale...@us...> - 2009-06-19 13:01:28
|
Revision: 2657 http://morphix.svn.sourceforge.net/morphix/?rev=2657&view=rev Author: alextreme Date: 2009-06-19 12:26:21 +0000 (Fri, 19 Jun 2009) Log Message: ----------- * make isomaker/mmaker allow unauthenticated releases with cdebootstrap (for older suites) Modified Paths: -------------- trunk/mmaker/libmorphix/makemodule.c Modified: trunk/mmaker/libmorphix/makemodule.c =================================================================== --- trunk/mmaker/libmorphix/makemodule.c 2009-03-10 13:37:01 UTC (rev 2656) +++ trunk/mmaker/libmorphix/makemodule.c 2009-06-19 12:26:21 UTC (rev 2657) @@ -1133,7 +1133,7 @@ arch = g_strdup_printf("--arch %s",module->arch); } - cmdline = g_strdup_printf("%s %s %s %s %s",P_DEBOOTSTRAP,arch,module->suite,module->dirname,temp->name); + cmdline = g_strdup_printf("%s p --allow-unauthenticated %s %s %s %s",P_DEBOOTSTRAP,arch,module->suite,module->dirname,temp->name); g_free(arch); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ale...@us...> - 2009-06-19 13:01:17
|
Revision: 2658 http://morphix.svn.sourceforge.net/morphix/?rev=2658&view=rev Author: alextreme Date: 2009-06-19 12:32:24 +0000 (Fri, 19 Jun 2009) Log Message: ----------- * bumping Modified Paths: -------------- trunk/mmaker/debian/changelog Modified: trunk/mmaker/debian/changelog =================================================================== --- trunk/mmaker/debian/changelog 2009-06-19 12:26:21 UTC (rev 2657) +++ trunk/mmaker/debian/changelog 2009-06-19 12:32:24 UTC (rev 2658) @@ -1,3 +1,9 @@ +morphix-mmaker (0.4-48) unstable; urgency=low + + * allowing debootstrap to continue with unauthenticated repositories + + -- Alex de Landgraaf <al...@de...> Fri, 19 Jun 2009 14:30:00 +0200 + morphix-mmaker (0.4-47) unstable; urgency=low * Even more paul_c magic This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ale...@us...> - 2009-03-10 13:52:08
|
Revision: 2656 http://morphix.svn.sourceforge.net/morphix/?rev=2656&view=rev Author: alextreme Date: 2009-03-10 13:37:01 +0000 (Tue, 10 Mar 2009) Log Message: ----------- * burp Modified Paths: -------------- trunk/scripts-base/debian/changelog Modified: trunk/scripts-base/debian/changelog =================================================================== --- trunk/scripts-base/debian/changelog 2009-03-09 17:06:48 UTC (rev 2655) +++ trunk/scripts-base/debian/changelog 2009-03-10 13:37:01 UTC (rev 2656) @@ -1,3 +1,16 @@ +morphix-base-scripts (0.5-76) unstable; urgency=low + + * Cleaning up basescripts + + -- Alex de Landgraaf <al...@de...> Tue, 10 Mar 2009 12:10:21 +0100 + +morphix-base-scripts (0.5-75) unstable; urgency=low + + * Minimodules now get loaded before deb-copy-exec + * Other minor fixes + + -- Alex de Landgraaf <al...@de...> Mon, 02 Mar 2009 11:05:16 +0100 + morphix-base-scripts (0.5-74) unstable; urgency=low * Another attempt This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <pa...@us...> - 2009-03-09 17:07:02
|
Revision: 2655 http://morphix.svn.sourceforge.net/morphix/?rev=2655&view=rev Author: paul_c Date: 2009-03-09 17:06:48 +0000 (Mon, 09 Mar 2009) Log Message: ----------- Silence warnings/errors when attempting to load nonexistant drivers (they *might* be built in rather than compiled as modules). Thanks to Plugh for the feedback. Modified Paths: -------------- trunk/scripts-base/miniroot/linuxrc-scripts/linuxrc Modified: trunk/scripts-base/miniroot/linuxrc-scripts/linuxrc =================================================================== --- trunk/scripts-base/miniroot/linuxrc-scripts/linuxrc 2009-03-09 16:17:24 UTC (rev 2654) +++ trunk/scripts-base/miniroot/linuxrc-scripts/linuxrc 2009-03-09 17:06:48 UTC (rev 2655) @@ -227,25 +227,25 @@ } # load modules needed to use VFAT filesystem -$INSMOD -f /modules/nls/nls_cp437$KEXT >/dev/null -$INSMOD -f /modules/nls/nls_iso8859-1$KEXT >/dev/null +$INSMOD -f /modules/nls/nls_cp437$KEXT >/dev/null 2>&1 +$INSMOD -f /modules/nls/nls_iso8859-1$KEXT >/dev/null 2>&1 # SCSI modules need to be loaded before usb-storage -$INSMOD -f /modules/scsi/scsi_mod$KEXT >/dev/null -$INSMOD -f /modules/scsi/sg$KEXT >/dev/null -$INSMOD -f /modules/scsi/sr_mod$KEXT >/dev/null -$INSMOD -f /modules/scsi/sd_mod$KEXT >/dev/null -$INSMOD -f /modules/scsi/st$KEXT >/dev/null +$INSMOD -f /modules/scsi/scsi_mod$KEXT >/dev/null 2>&1 +$INSMOD -f /modules/scsi/sg$KEXT >/dev/null 2>&1 +$INSMOD -f /modules/scsi/sr_mod$KEXT >/dev/null 2>&1 +$INSMOD -f /modules/scsi/sd_mod$KEXT >/dev/null 2>&1 +$INSMOD -f /modules/scsi/st$KEXT >/dev/null 2>&1 -$INSMOD -f /modules/usb/usbcore$KEXT >/dev/null +$INSMOD -f /modules/usb/usbcore$KEXT >/dev/null 2>&1 -$INSMOD -f /modules/usb/ehci-hcd$KEXT >/dev/null -$INSMOD -f /modules/usb/uhci-hcd$KEXT >/dev/null -$INSMOD -f /modules/usb/ohci-hcd$KEXT >/dev/null -$INSMOD -f /modules/scsi/sd_mod$KEXT >/dev/null -$INSMOD -f /modules/usb/usb-storage$KEXT >/dev/null +$INSMOD -f /modules/usb/ehci-hcd$KEXT >/dev/null 2>&1 +$INSMOD -f /modules/usb/uhci-hcd$KEXT >/dev/null 2>&1 +$INSMOD -f /modules/usb/ohci-hcd$KEXT >/dev/null 2>&1 +$INSMOD -f /modules/scsi/sd_mod$KEXT >/dev/null 2>&1 +$INSMOD -f /modules/usb/usb-storage$KEXT >/dev/null 2>&1 # Load the USB keyboard driver *just* in case.. -$INSMOD -f /modules/usb/usbkbd$KEXT >/dev/null +$INSMOD -f /modules/usb/usbkbd$KEXT >/dev/null 2>&1 # Wait for devices to be registered sleep 2 @@ -348,7 +348,7 @@ do echo -n "${CRE}${BLUE}Looking for CDROM in: ${MAGENTA}$i${NORMAL} " if [ -z "$FROMISO" ]; then - if mountit $i /$MOUNT_IMAGE "-o $MOUNT_OPT" >/dev/null + if mountit $i /$MOUNT_IMAGE "-o $MOUNT_OPT" >/dev/null 2>&1 then if test -d /$MOUNT_IMAGE/$HD_DIRECTORY/base then @@ -390,11 +390,11 @@ fi done -[ -n "$HD_DIRECTORY" ] && mount -o bind,ro /$MOUNT_IMAGE/$HD_DIRECTORY /cdrom >/dev/null +[ -n "$HD_DIRECTORY" ] && mount -o bind,ro /$MOUNT_IMAGE/$HD_DIRECTORY /cdrom >/dev/null 2>&1 if test -n "$SPLASH" -a -f /bootsplash/config/bootsplash2-1024x768.cfg; then -splash -s -u 1000 /bootsplash/config/bootsplash2-1024x768.cfg >/dev/null +splash -s -u 1000 /bootsplash/config/bootsplash2-1024x768.cfg >/dev/null 2>&1 fi # We now enable DMA right here, for faster reading/writing from/to IDE devices @@ -618,7 +618,7 @@ # ln -s /MorphixCD/var/cache/apt /var/cache/ 2>/dev/null rm /etc/resolv.conf 2>/dev/null - ln -s /MorphixCD/etc/skel /etc/dhcpc/resolv.conf \ + ln -sf /MorphixCD/etc/skel /etc/dhcpc/resolv.conf \ /etc/ >/dev/null # This is a memory-hogging hack, but somehow there isn't enough room on the first ramdisk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ale...@us...> - 2009-03-09 16:17:34
|
Revision: 2654 http://morphix.svn.sourceforge.net/morphix/?rev=2654&view=rev Author: alextreme Date: 2009-03-09 16:17:24 +0000 (Mon, 09 Mar 2009) Log Message: ----------- * meh Modified Paths: -------------- trunk/mmaker/debian/changelog trunk/mmaker/libmorphix/makemodule.c Modified: trunk/mmaker/debian/changelog =================================================================== --- trunk/mmaker/debian/changelog 2009-03-09 16:14:08 UTC (rev 2653) +++ trunk/mmaker/debian/changelog 2009-03-09 16:17:24 UTC (rev 2654) @@ -1,3 +1,9 @@ +morphix-mmaker (0.4-47) unstable; urgency=low + + * Even more paul_c magic + + -- Alex de Landgraaf <al...@de...> Mon, 09 Mar 2009 17:13:56 +0100 + morphix-mmaker (0.4-46) unstable; urgency=low * More paul_c magic Modified: trunk/mmaker/libmorphix/makemodule.c =================================================================== --- trunk/mmaker/libmorphix/makemodule.c 2009-03-09 16:14:08 UTC (rev 2653) +++ trunk/mmaker/libmorphix/makemodule.c 2009-03-09 16:17:24 UTC (rev 2654) @@ -1184,7 +1184,7 @@ fprintf(stderr,"Info: In getAptPackageSources\n"); // Store for future usage, do this regardless of any source being downloaded - savePackagelist(module, module->dirname); + savePackageList(module, module->dirname); if (sources_location == NULL) { // no sources wanted return TRUE; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <pa...@us...> - 2009-03-09 16:14:18
|
Revision: 2653 http://morphix.svn.sourceforge.net/morphix/?rev=2653&view=rev Author: paul_c Date: 2009-03-09 16:14:08 +0000 (Mon, 09 Mar 2009) Log Message: ----------- and for good measure, check other `rm` invocations.. Modified Paths: -------------- trunk/mmaker/libmorphix/makemodule.c trunk/mmaker/src/isomaker.c Modified: trunk/mmaker/libmorphix/makemodule.c =================================================================== --- trunk/mmaker/libmorphix/makemodule.c 2009-03-09 16:10:23 UTC (rev 2652) +++ trunk/mmaker/libmorphix/makemodule.c 2009-03-09 16:14:08 UTC (rev 2653) @@ -629,7 +629,7 @@ g_free(cmdline); - cmdline = g_strdup_printf("%s %s rm /%s",P_CHROOT,module->dirname,basename); + cmdline = g_strdup_printf("%s %s rm -f /%s",P_CHROOT,module->dirname,basename); if (!ExecuteCommand(cmdline)) { fprintf(stderr,"Warning: unable to remove local package after installation: %s\n",ptr->data); } @@ -676,7 +676,7 @@ } g_free(cmdline); - cmdline = g_strdup_printf("%s %s rm /%s",P_CHROOT,module->dirname,basename); + cmdline = g_strdup_printf("%s %s rm -f /%s",P_CHROOT,module->dirname,basename); if (!ExecuteCommand(cmdline)) { fprintf(stderr,"Warning: unable to remove patch script after executing it: %s\n",ptr->data); } @@ -929,7 +929,7 @@ ExecuteCommand(cmdline); g_free(cmdline); - cmdline = g_strdup_printf("rm %s/%s", module->dirname, filename); + cmdline = g_strdup_printf("rm -f %s/%s", module->dirname, filename); ExecuteCommand(cmdline); g_free(cmdline); Modified: trunk/mmaker/src/isomaker.c =================================================================== --- trunk/mmaker/src/isomaker.c 2009-03-09 16:10:23 UTC (rev 2652) +++ trunk/mmaker/src/isomaker.c 2009-03-09 16:14:08 UTC (rev 2653) @@ -175,10 +175,10 @@ executeCommandMain(cmdline); g_free(cmdline); - cmdline = g_strdup_printf("sh -c \"rm %s/*.deb\"",workdir); + cmdline = g_strdup_printf("sh -c \"rm -f %s/*.deb\"",workdir); executeCommandMain(cmdline); g_free(cmdline); - cmdline = g_strdup_printf("sh -c \"rm %s/*.udeb\"",workdir); + cmdline = g_strdup_printf("sh -c \"rm -f %s/*.udeb\"",workdir); executeCommandMain(cmdline); g_free(cmdline); } @@ -436,7 +436,7 @@ ExecuteCommand(cmdline); g_free(cmdline); - cmdline = g_strdup_printf("rm /tmp/tmp.iso"); + cmdline = g_strdup_printf("rm -f /tmp/tmp.iso"); ExecuteCommand(cmdline); g_free(cmdline); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <pa...@us...> - 2009-03-09 16:10:26
|
Revision: 2652 http://morphix.svn.sourceforge.net/morphix/?rev=2652&view=rev Author: paul_c Date: 2009-03-09 16:10:23 +0000 (Mon, 09 Mar 2009) Log Message: ----------- Add recursive an/or force flag to invocations of `rm` - This should reduces the number of errors logged during (auto)builds. Modified Paths: -------------- trunk/mmaker/libmorphix/makebase.c trunk/mmaker/libmorphix/makemodule.c Modified: trunk/mmaker/libmorphix/makebase.c =================================================================== --- trunk/mmaker/libmorphix/makebase.c 2009-03-02 23:52:30 UTC (rev 2651) +++ trunk/mmaker/libmorphix/makebase.c 2009-03-09 16:10:23 UTC (rev 2652) @@ -300,7 +300,7 @@ */ gboolean stripBaseModule(mmodule *module) { - gchar *cmdline = g_strdup_printf("rm -rf %s/var/cache %s/var/lib/apt %s/var/lib/dpkg",module->dirname,module->dirname,module->dirname); + gchar *cmdline = g_strdup_printf("rm -Rf %s/var/cache %s/var/lib/apt %s/var/lib/dpkg",module->dirname,module->dirname,module->dirname); ExecuteCommand(cmdline); g_free(cmdline); @@ -308,11 +308,11 @@ ExecuteCommand(cmdline); g_free(cmdline); - cmdline = g_strdup_printf("rm -rf %s/usr/share/doc %s/usr/share/unidata %s/usr/share/locale %s/usr/share/doc",module->dirname,module->dirname,module->dirname,module->dirname); + cmdline = g_strdup_printf("rm -Rf %s/usr/share/doc %s/usr/share/unidata %s/usr/share/locale %s/usr/share/doc",module->dirname,module->dirname,module->dirname,module->dirname); ExecuteCommand(cmdline); g_free(cmdline); - cmdline = g_strdup_printf("rm -r %s/usr/share/man %s/usr/share/info %s/usr/share/aptitude",module->dirname,module->dirname,module->dirname); + cmdline = g_strdup_printf("rm -Rf %s/usr/share/man %s/usr/share/info %s/usr/share/aptitude",module->dirname,module->dirname,module->dirname); ExecuteCommand(cmdline); g_free(cmdline); /* Modified: trunk/mmaker/libmorphix/makemodule.c =================================================================== --- trunk/mmaker/libmorphix/makemodule.c 2009-03-02 23:52:30 UTC (rev 2651) +++ trunk/mmaker/libmorphix/makemodule.c 2009-03-09 16:10:23 UTC (rev 2652) @@ -197,7 +197,7 @@ /* Not everyone will agree with this, but it saves quite a bit of space */ - cmdline = g_strdup_printf("%s %s sh -c \"rm -f /var/lib/apt/lists/*\"",P_CHROOT,dirname); + cmdline = g_strdup_printf("%s %s sh -c \"rm -fR /var/lib/apt/lists/*\"",P_CHROOT,dirname); ExecuteCommand(cmdline); g_free(cmdline); @@ -487,7 +487,7 @@ } g_free(cmdline); - cmdline = g_strdup_printf("rm -r %s/dev/*",dirname); + cmdline = g_strdup_printf("rm -fR %s/dev/*",dirname); if (!ExecuteCommand(cmdline)) { g_free(cmdline); fprintf(stderr,"Error: unable to remove /dev/* in chroot\n"); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <kc...@us...> - 2009-03-02 23:52:44
|
Revision: 2651 http://morphix.svn.sourceforge.net/morphix/?rev=2651&view=rev Author: kcozens Date: 2009-03-02 23:52:30 +0000 (Mon, 02 Mar 2009) Log Message: ----------- Switched order of copy and exec option lines in usage output. Added blank lines in output from --list to aid in readability. Modified Paths: -------------- trunk/morph-scripts/isomorph.pl Modified: trunk/morph-scripts/isomorph.pl =================================================================== --- trunk/morph-scripts/isomorph.pl 2009-03-02 07:56:08 UTC (rev 2650) +++ trunk/morph-scripts/isomorph.pl 2009-03-02 23:52:30 UTC (rev 2651) @@ -157,16 +157,16 @@ [--list main ISO]\t\t\tlist mainmodules [--list mini ISO]\t\t\tlist minimodules [--list deb ISO]\t\t\tlist debian packages +[--list copy ISO]\t\t\tlist copy-on-boot files [--list exec ISO]\t\t\tlist scripts -[--list copy ISO]\t\t\tlist copy-on-boot files add options: [--add base BASEMODULE OLDISO NEWISO]\t\treplace basemodule [--add main MAINMODULE OLDISO NEWISO]\t\tadd mainmodule to oldiso [--add mini MINIMODULE OLDISO NEWISO]\t\tadd minimodule to oldiso [--add deb DEBPACKAGE OLDISO NEWISO]\t\tadd package to oldiso +[--add copy FILE PATH OLDISO NEWISO]\t\tadd file to oldiso in path [--add exec SHELLSCRIPT OLDISO NEWISO]\t\tadd script to oldiso -[--add copy FILE PATH OLDISO NEWISO]\t\tadd file to oldiso in path [--add boot \"Boot Option\" OLDISO NEWISO]\tadd boot option to oldiso get options: @@ -174,8 +174,8 @@ [--get main ISO DIRECTORY]\t\tcopy mainmodules from iso to directory [--get mini ISO DIRECTORY]\t\tcopy minimodules [--get deb ISO DIRECTORY]\t\tcopy debian packages +[--get copy ISO DIRECTORY]\t\tcopy copy-on-boot files [--get exec ISO DIRECTORY]\t\tcopy scripts -[--get copy ISO DIRECTORY]\t\tcopy copy-on-boot files delete options: [--del-all OLDISO NEWISO]\t\t\tdelete all morphix files from ISO @@ -187,8 +187,8 @@ [--del main MAINMODULE OLDISO NEWISO]\t\tdelete mainmodule from oldiso [--del mini MINIMODULE OLDISO NEWISO]\t\tdelete minimodule from oldiso [--del deb DEBPACKAGE OLDISO NEWISO]\t\tdelete package from oldiso +[--del copy FILE OLDISO NEWISO] [--del exec SHELLSCRIPT OLDISO NEWISO] -[--del copy FILE OLDISO NEWISO] [--del boot \"Boot Option\" OLDISO NEWISO]\tdelete boot option from oldiso \n"); exit(1); @@ -498,6 +498,7 @@ } closedir(DIR); } + print "\n"; } } @@ -525,6 +526,7 @@ } closedir(DIR); } + print "\n"; } } @@ -552,6 +554,7 @@ } closedir(DIR); } + print "\n"; } } @@ -579,6 +582,7 @@ } closedir(DIR); } + print "\n"; } } @@ -622,6 +626,7 @@ } closedir(DIR); } + print "\n"; } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ale...@us...> - 2009-03-02 07:56:11
|
Revision: 2650 http://morphix.svn.sourceforge.net/morphix/?rev=2650&view=rev Author: alextreme Date: 2009-03-02 07:56:08 +0000 (Mon, 02 Mar 2009) Log Message: ----------- * output name of minimodule being loaded Modified Paths: -------------- trunk/scripts-base/etc/init.d/load-minimodules.sh Modified: trunk/scripts-base/etc/init.d/load-minimodules.sh =================================================================== --- trunk/scripts-base/etc/init.d/load-minimodules.sh 2009-03-02 07:47:39 UTC (rev 2649) +++ trunk/scripts-base/etc/init.d/load-minimodules.sh 2009-03-02 07:56:08 UTC (rev 2650) @@ -67,8 +67,9 @@ MiniModules="$(ls /media/*/minimod/*.mod 2> /dev/null)" for file in $MiniModules do - load_mini_module "$file" $MiniModuleCount - ((MiniModuleCount += 1)) + einfo "Loading $file" + load_mini_module "$file" $MiniModuleCount + ((MiniModuleCount += 1)) done fi This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ale...@us...> - 2009-03-02 07:47:43
|
Revision: 2649 http://morphix.svn.sourceforge.net/morphix/?rev=2649&view=rev Author: alextreme Date: 2009-03-02 07:47:39 +0000 (Mon, 02 Mar 2009) Log Message: ----------- * moving deb-copy-exec to after loading minimods. Brendan, please comment if I broke anything. Modified Paths: -------------- trunk/scripts-base/etc/init.d/morphix-start Modified: trunk/scripts-base/etc/init.d/morphix-start =================================================================== --- trunk/scripts-base/etc/init.d/morphix-start 2009-02-25 21:50:50 UTC (rev 2648) +++ trunk/scripts-base/etc/init.d/morphix-start 2009-03-02 07:47:39 UTC (rev 2649) @@ -535,20 +535,20 @@ #### # -# Check /deb /copy /exec cdrom-directories for files +# Load minimodules (from chroot) # #### -deb_copy_exec /media/cdrom +cp /etc/init.d/load-minimodules.sh /mnt/main/etc/init.d/ +chroot /mnt/main sh /etc/init.d/load-minimodules.sh #### # -# Load minimodules (from chroot) +# Check /deb /copy /exec cdrom-directories for files # #### -cp /etc/init.d/load-minimodules.sh /mnt/main/etc/init.d/ -chroot /mnt/main sh /etc/init.d/load-minimodules.sh +deb_copy_exec /media/cdrom ### # This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ale...@us...> - 2009-02-25 23:34:34
|
Revision: 2648 http://morphix.svn.sourceforge.net/morphix/?rev=2648&view=rev Author: alextreme Date: 2009-02-25 21:50:50 +0000 (Wed, 25 Feb 2009) Log Message: ----------- * reordering minimodgen Modified Paths: -------------- trunk/morph-scripts/debian/changelog trunk/morph-scripts/minimod-gen.pl Modified: trunk/morph-scripts/debian/changelog =================================================================== --- trunk/morph-scripts/debian/changelog 2009-01-27 14:53:00 UTC (rev 2647) +++ trunk/morph-scripts/debian/changelog 2009-02-25 21:50:50 UTC (rev 2648) @@ -1,3 +1,9 @@ +morph-scripts (0.2-37) unstable; urgency=low + + * Fixing make-iso + + -- Alex de Landgraaf <al...@de...> Thu, 20 Mar 2008 00:18:38 +0100 + morph-scripts (0.2-36) unstable; urgency=low * Adding morphix-make-mini-home (a GUI-tool for creating a homedir minimod and storing it on a USB storage device) Modified: trunk/morph-scripts/minimod-gen.pl =================================================================== --- trunk/morph-scripts/minimod-gen.pl 2009-01-27 14:53:00 UTC (rev 2647) +++ trunk/morph-scripts/minimod-gen.pl 2009-02-25 21:50:50 UTC (rev 2648) @@ -581,21 +581,8 @@ open (OUT, ">$moddir/morphix/loadmod.sh"); print OUT "#!/bin/sh\n\#\n# This file has been generated by minimod-gen.pl\n\n"; - ### the copy option +### the debianpackage list option - while (($src,$dest) = each(%filelist)) { - $basename = (split/\//,$src)[-1]; - print OUT "cp -a \"\$1\"/morphix/files/$basename $dest\n"; - } - - ### the cmd/execute option - - foreach $cmd (@cmdlist) { - print OUT "$cmd\n"; - } - - ### the debianpackage list option - if (scalar @deblist_list != 0) { mkdir ("$moddir/morphix/deb",0755) || die "cannot mkdir $moddir/morphix/deb: $!"; our $filename; @@ -660,6 +647,21 @@ print OUT "mount --bind \"\$1\"/homedir /etc/skel\n"; print OUT "chown -R morph.users /home/morph\n"; } + + ### the copy option + + while (($src,$dest) = each(%filelist)) { + $basename = (split/\//,$src)[-1]; + print OUT "cp -a \"\$1\"/morphix/files/$basename $dest\n"; + } + + ### the cmd/execute option + + foreach $cmd (@cmdlist) { + print OUT "$cmd\n"; + } + + print OUT "\necho \"MiniModule loaded\""; close OUT; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ale...@us...> - 2009-01-27 14:53:05
|
Revision: 2647 http://morphix.svn.sourceforge.net/morphix/?rev=2647&view=rev Author: alextreme Date: 2009-01-27 14:53:00 +0000 (Tue, 27 Jan 2009) Log Message: ----------- * bump Modified Paths: -------------- trunk/mmaker/debian/changelog Modified: trunk/mmaker/debian/changelog =================================================================== --- trunk/mmaker/debian/changelog 2009-01-27 14:34:29 UTC (rev 2646) +++ trunk/mmaker/debian/changelog 2009-01-27 14:53:00 UTC (rev 2647) @@ -1,3 +1,9 @@ +morphix-mmaker (0.4-46) unstable; urgency=low + + * More paul_c magic + + -- Alex de Landgraaf <al...@de...> Tue, 27 Jan 2009 15:47:24 +0100 + morphix-mmaker (0.4-45) unstable; urgency=low * With a touch of paul_c magic This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <pa...@us...> - 2009-01-27 14:34:37
|
Revision: 2646 http://morphix.svn.sourceforge.net/morphix/?rev=2646&view=rev Author: paul_c Date: 2009-01-27 14:34:29 +0000 (Tue, 27 Jan 2009) Log Message: ----------- Call out savePackageList instead of rewriting the `dpkg -l` code... Move deletePackages up so that the package & source lists reflect what is installed after any <packagedel> tags have been accounted for. dpkg is a core package and gets brutally killed off after we are done with it, so the (minor) changes made will still work. Modified Paths: -------------- trunk/mmaker/libmorphix/makemodule.c Modified: trunk/mmaker/libmorphix/makemodule.c =================================================================== --- trunk/mmaker/libmorphix/makemodule.c 2009-01-26 23:05:35 UTC (rev 2645) +++ trunk/mmaker/libmorphix/makemodule.c 2009-01-27 14:34:29 UTC (rev 2646) @@ -940,13 +940,15 @@ } } + deletePackages(module,module->dirname); + + // Save the package & source lists after removing queued packagedel tags. savePackageList(module,module->dirname); if (!getAptPackageSources(module, sources_location)) { return FALSE; } - deletePackages(module,module->dirname); deleteCruft(module->dirname); if (!cleanApt(module,module->dirname)) { @@ -1182,9 +1184,7 @@ fprintf(stderr,"Info: In getAptPackageSources\n"); // Store for future usage, do this regardless of any source being downloaded - cmdline = g_strdup_printf("%s %s sh -c \"COLUMNS=160 dpkg -l > /morphix/packages.gz\"",P_CHROOT,module->dirname); - ExecuteCommand(cmdline); - g_free(cmdline); + savePackagelist(module, module->dirname); if (sources_location == NULL) { // no sources wanted return TRUE; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ale...@us...> - 2009-01-26 23:05:38
|
Revision: 2645 http://morphix.svn.sourceforge.net/morphix/?rev=2645&view=rev Author: alextreme Date: 2009-01-26 23:05:35 +0000 (Mon, 26 Jan 2009) Log Message: ----------- * bumping Modified Paths: -------------- trunk/mmaker/debian/changelog Modified: trunk/mmaker/debian/changelog =================================================================== --- trunk/mmaker/debian/changelog 2009-01-26 22:52:51 UTC (rev 2644) +++ trunk/mmaker/debian/changelog 2009-01-26 23:05:35 UTC (rev 2645) @@ -1,3 +1,9 @@ +morphix-mmaker (0.4-45) unstable; urgency=low + + * With a touch of paul_c magic + + -- Alex de Landgraaf <al...@de...> Tue, 27 Jan 2009 00:02:04 +0100 + morphix-mmaker (0.4-44) unstable; urgency=low * Fixes for -s (source retrieval option), added to isomaker. Confirmed it might actually work this time! This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ale...@us...> - 2009-01-26 22:52:59
|
Revision: 2644 http://morphix.svn.sourceforge.net/morphix/?rev=2644&view=rev Author: alextreme Date: 2009-01-26 22:52:51 +0000 (Mon, 26 Jan 2009) Log Message: ----------- * commiting changes to packaged busybox udeb (1.10.2-3) Modified Paths: -------------- trunk/scripts-base/miniroot/busybox/debian/config-udeb-morphix trunk/scripts-base/miniroot/busybox/debian/control trunk/scripts-base/miniroot/busybox/debian/rules Modified: trunk/scripts-base/miniroot/busybox/debian/config-udeb-morphix =================================================================== --- trunk/scripts-base/miniroot/busybox/debian/config-udeb-morphix 2009-01-26 13:17:21 UTC (rev 2643) +++ trunk/scripts-base/miniroot/busybox/debian/config-udeb-morphix 2009-01-26 22:52:51 UTC (rev 2644) @@ -1,53 +1,135 @@ # # Automatically generated make config: don't edit +# Busybox version: 1.10.2 +# Mon Jan 26 23:29:49 2009 # -HAVE_DOT_CONFIG=y +CONFIG_HAVE_DOT_CONFIG=y # +# Busybox Settings +# + +# # General Configuration # -CONFIG_FEATURE_BUFFERS_USE_MALLOC=y +# CONFIG_NITPICK is not set +# CONFIG_DESKTOP is not set +# CONFIG_FEATURE_BUFFERS_USE_MALLOC is not set # CONFIG_FEATURE_BUFFERS_GO_ON_STACK is not set # CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set +CONFIG_SHOW_USAGE=y # CONFIG_FEATURE_VERBOSE_USAGE is not set +CONFIG_FEATURE_COMPRESS_USAGE=y # CONFIG_FEATURE_INSTALLER is not set # CONFIG_LOCALE_SUPPORT is not set -# CONFIG_FEATURE_DEVFS is not set +CONFIG_GETOPT_LONG=y # CONFIG_FEATURE_DEVPTS is not set # CONFIG_FEATURE_CLEAN_UP is not set +# CONFIG_FEATURE_PIDFILE is not set # CONFIG_FEATURE_SUID is not set +# CONFIG_FEATURE_SUID_CONFIG is not set +# CONFIG_FEATURE_SUID_CONFIG_QUIET is not set # CONFIG_SELINUX is not set +# CONFIG_FEATURE_PREFER_APPLETS is not set +CONFIG_BUSYBOX_EXEC_PATH="/proc/self/exe" +CONFIG_FEATURE_SYSLOG=y +# CONFIG_FEATURE_HAVE_RPC is not set # # Build Options # CONFIG_STATIC=y +# CONFIG_NOMMU is not set +# CONFIG_BUILD_LIBBUSYBOX is not set +# CONFIG_FEATURE_INDIVIDUAL is not set +# CONFIG_FEATURE_SHARED_BUSYBOX is not set CONFIG_LFS=y -USING_CROSS_COMPILER=y -CROSS_COMPILER_PREFIX="/usr/i386-uclibc-linux/bin/i386-uclibc-linux-" -EXTRA_CFLAGS_OPTIONS="" # +# Debugging Options +# +# CONFIG_DEBUG is not set +# CONFIG_WERROR is not set +CONFIG_NO_DEBUG_LIB=y +# CONFIG_DMALLOC is not set +# CONFIG_EFENCE is not set +CONFIG_INCLUDE_SUSv2=y + +# # Installation Options # # CONFIG_INSTALL_NO_USR is not set -PREFIX="./_install" +CONFIG_INSTALL_APPLET_SYMLINKS=y +# CONFIG_INSTALL_APPLET_HARDLINKS is not set +# CONFIG_INSTALL_APPLET_SCRIPT_WRAPPERS is not set +# CONFIG_INSTALL_APPLET_DONT is not set +# CONFIG_INSTALL_SH_APPLET_SYMLINK is not set +# CONFIG_INSTALL_SH_APPLET_HARDLINK is not set +# CONFIG_INSTALL_SH_APPLET_SCRIPT_WRAPPER is not set +CONFIG_PREFIX="./_install" # +# Busybox Library Tuning +# +CONFIG_PASSWORD_MINLEN=6 +CONFIG_MD5_SIZE_VS_SPEED=2 +# CONFIG_FEATURE_FAST_TOP is not set +# CONFIG_FEATURE_ETC_NETWORKS is not set +# CONFIG_FEATURE_EDITING is not set +CONFIG_FEATURE_EDITING_MAX_LEN= +# CONFIG_FEATURE_EDITING_VI is not set +CONFIG_FEATURE_EDITING_HISTORY= +# CONFIG_FEATURE_EDITING_SAVEHISTORY is not set +# CONFIG_FEATURE_TAB_COMPLETION is not set +# CONFIG_FEATURE_USERNAME_COMPLETION is not set +# CONFIG_FEATURE_EDITING_FANCY_PROMPT is not set +# CONFIG_FEATURE_VERBOSE_CP_MESSAGE is not set +CONFIG_FEATURE_COPYBUF_KB=4 +CONFIG_MONOTONIC_SYSCALL=y +CONFIG_IOCTL_HEX2STR_ERROR=y + +# +# Applets +# + +# # Archival Utilities # # CONFIG_AR is not set +# CONFIG_FEATURE_AR_LONG_FILENAMES is not set # CONFIG_BUNZIP2 is not set +# CONFIG_BZIP2 is not set # CONFIG_CPIO is not set # CONFIG_DPKG is not set # CONFIG_DPKG_DEB is not set +# CONFIG_FEATURE_DPKG_DEB_EXTRACT_ONLY is not set # CONFIG_GUNZIP is not set +# CONFIG_FEATURE_GUNZIP_UNCOMPRESS is not set # CONFIG_GZIP is not set # CONFIG_RPM2CPIO is not set # CONFIG_RPM is not set +# CONFIG_FEATURE_RPM_BZ2 is not set # CONFIG_TAR is not set +# CONFIG_FEATURE_TAR_CREATE is not set +# CONFIG_FEATURE_TAR_GZIP is not set +# CONFIG_FEATURE_TAR_BZIP2 is not set +# CONFIG_FEATURE_TAR_LZMA is not set +# CONFIG_FEATURE_TAR_COMPRESS is not set +# CONFIG_FEATURE_TAR_AUTODETECT is not set +# CONFIG_FEATURE_TAR_FROM is not set +# CONFIG_FEATURE_TAR_OLDGNU_COMPATIBILITY is not set +# CONFIG_FEATURE_TAR_OLDSUN_COMPATIBILITY is not set +# CONFIG_FEATURE_TAR_GNU_EXTENSIONS is not set +# CONFIG_FEATURE_TAR_LONG_OPTIONS is not set +# CONFIG_FEATURE_TAR_UNAME_GNAME is not set # CONFIG_UNCOMPRESS is not set +# CONFIG_UNLZMA is not set +# CONFIG_FEATURE_LZMA_FAST is not set # CONFIG_UNZIP is not set +# CONFIG_FEATURE_UNARCHIVE_TAPE is not set +# CONFIG_FEATURE_DEB_TAR_GZ is not set +# CONFIG_FEATURE_DEB_TAR_BZ2 is not set +# CONFIG_FEATURE_DEB_TAR_LZMA is not set # # Coreutils @@ -55,29 +137,43 @@ # CONFIG_BASENAME is not set # CONFIG_CAL is not set CONFIG_CAT=y +# CONFIG_CATV is not set # CONFIG_CHGRP is not set # CONFIG_CHMOD is not set # CONFIG_CHOWN is not set # CONFIG_CHROOT is not set -# CONFIG_CMP is not set +# CONFIG_CKSUM is not set +# CONFIG_COMM is not set # CONFIG_CP is not set # CONFIG_CUT is not set # CONFIG_DATE is not set +# CONFIG_FEATURE_DATE_ISOFMT is not set # CONFIG_DD is not set +# CONFIG_FEATURE_DD_SIGNAL_HANDLING is not set +# CONFIG_FEATURE_DD_IBS_OBS is not set # CONFIG_DF is not set +# CONFIG_FEATURE_DF_INODE is not set # CONFIG_DIRNAME is not set # CONFIG_DOS2UNIX is not set +# CONFIG_UNIX2DOS is not set # CONFIG_DU is not set +# CONFIG_FEATURE_DU_DEFAULT_BLOCKSIZE_1K is not set CONFIG_ECHO=y CONFIG_FEATURE_FANCY_ECHO=y # CONFIG_ENV is not set +# CONFIG_FEATURE_ENV_LONG_OPTIONS is not set +# CONFIG_EXPAND is not set +# CONFIG_FEATURE_EXPAND_LONG_OPTIONS is not set CONFIG_EXPR=y +# CONFIG_EXPR_MATH_SUPPORT_64 is not set CONFIG_FALSE=y # CONFIG_FOLD is not set # CONFIG_HEAD is not set +# CONFIG_FEATURE_FANCY_HEAD is not set # CONFIG_HOSTID is not set # CONFIG_ID is not set # CONFIG_INSTALL is not set +# CONFIG_FEATURE_INSTALL_LONG_OPTIONS is not set # CONFIG_LENGTH is not set # CONFIG_LN is not set # CONFIG_LOGNAME is not set @@ -89,48 +185,68 @@ # CONFIG_FEATURE_LS_TIMESTAMPS is not set # CONFIG_FEATURE_LS_USERNAME is not set # CONFIG_FEATURE_LS_COLOR is not set +# CONFIG_FEATURE_LS_COLOR_IS_DEFAULT is not set CONFIG_MD5SUM=y # CONFIG_MKDIR is not set +# CONFIG_FEATURE_MKDIR_LONG_OPTIONS is not set # CONFIG_MKFIFO is not set # CONFIG_MKNOD is not set # CONFIG_MV is not set +# CONFIG_FEATURE_MV_LONG_OPTIONS is not set +# CONFIG_NICE is not set +# CONFIG_NOHUP is not set # CONFIG_OD is not set +# CONFIG_PRINTENV is not set # CONFIG_PRINTF is not set # CONFIG_PWD is not set +# CONFIG_READLINK is not set +# CONFIG_FEATURE_READLINK_FOLLOW is not set # CONFIG_REALPATH is not set # CONFIG_RM is not set # CONFIG_RMDIR is not set +# CONFIG_FEATURE_RMDIR_LONG_OPTIONS is not set # CONFIG_SEQ is not set # CONFIG_SHA1SUM is not set CONFIG_SLEEP=y # CONFIG_FEATURE_FANCY_SLEEP is not set # CONFIG_SORT is not set +# CONFIG_FEATURE_SORT_BIG is not set +# CONFIG_SPLIT is not set +# CONFIG_FEATURE_SPLIT_FANCY is not set +# CONFIG_STAT is not set +# CONFIG_FEATURE_STAT_FORMAT is not set # CONFIG_STTY is not set +# CONFIG_SUM is not set # CONFIG_SYNC is not set -# CONFIG_TAIL is not set +# CONFIG_TAC is not set +CONFIG_TAIL=y +CONFIG_FEATURE_FANCY_TAIL=y # CONFIG_TEE is not set +# CONFIG_FEATURE_TEE_USE_BLOCK_IO is not set CONFIG_TEST=y - -# -# test (forced enabled for use with shell) -# -# CONFIG_TOUCH is not set -# CONFIG_TR is not set +# CONFIG_FEATURE_TEST_64 is not set +CONFIG_TOUCH=y +CONFIG_TR=y +# CONFIG_FEATURE_TR_CLASSES is not set +# CONFIG_FEATURE_TR_EQUIV is not set # CONFIG_TRUE is not set # CONFIG_TTY is not set # CONFIG_UNAME is not set +# CONFIG_UNEXPAND is not set +# CONFIG_FEATURE_UNEXPAND_LONG_OPTIONS is not set # CONFIG_UNIQ is not set # CONFIG_USLEEP is not set # CONFIG_UUDECODE is not set # CONFIG_UUENCODE is not set -# CONFIG_WATCH is not set # CONFIG_WC is not set +# CONFIG_FEATURE_WC_LARGE is not set # CONFIG_WHO is not set # CONFIG_WHOAMI is not set # CONFIG_YES is not set +# CONFIG_FEATURE_PRESERVE_HARDLINKS is not set # -# Common options for ls and more +# Common options for ls, more and telnet # CONFIG_FEATURE_AUTOWIDTH=y @@ -151,156 +267,472 @@ # CONFIG_CLEAR is not set # CONFIG_DEALLOCVT is not set # CONFIG_DUMPKMAP is not set +# CONFIG_KBD_MODE is not set # CONFIG_LOADFONT is not set # CONFIG_LOADKMAP is not set # CONFIG_OPENVT is not set # CONFIG_RESET is not set +# CONFIG_RESIZE is not set +# CONFIG_FEATURE_RESIZE_PRINT is not set +# CONFIG_SETCONSOLE is not set +# CONFIG_FEATURE_SETCONSOLE_LONG_OPTIONS is not set # CONFIG_SETKEYCODES is not set +# CONFIG_SETLOGCONS is not set # # Debian Utilities # # CONFIG_MKTEMP is not set # CONFIG_PIPE_PROGRESS is not set -# CONFIG_READLINK is not set # CONFIG_RUN_PARTS is not set +# CONFIG_FEATURE_RUN_PARTS_LONG_OPTIONS is not set +# CONFIG_FEATURE_RUN_PARTS_FANCY is not set # CONFIG_START_STOP_DAEMON is not set +# CONFIG_FEATURE_START_STOP_DAEMON_FANCY is not set +# CONFIG_FEATURE_START_STOP_DAEMON_LONG_OPTIONS is not set # CONFIG_WHICH is not set # # Editors # -# CONFIG_AWK is not set +CONFIG_AWK=y +CONFIG_FEATURE_AWK_MATH=y +# CONFIG_CMP is not set +# CONFIG_DIFF is not set +# CONFIG_FEATURE_DIFF_BINARY is not set +# CONFIG_FEATURE_DIFF_DIR is not set +# CONFIG_FEATURE_DIFF_MINIMAL is not set +# CONFIG_ED is not set # CONFIG_PATCH is not set -# CONFIG_SED is not set +CONFIG_SED=y # CONFIG_VI is not set +CONFIG_FEATURE_VI_MAX_LEN= +# CONFIG_FEATURE_VI_8BIT is not set +# CONFIG_FEATURE_VI_COLON is not set +# CONFIG_FEATURE_VI_YANKMARK is not set +# CONFIG_FEATURE_VI_SEARCH is not set +# CONFIG_FEATURE_VI_USE_SIGNALS is not set +# CONFIG_FEATURE_VI_DOT_CMD is not set +# CONFIG_FEATURE_VI_READONLY is not set +# CONFIG_FEATURE_VI_SETOPTS is not set +# CONFIG_FEATURE_VI_SET is not set +# CONFIG_FEATURE_VI_WIN_RESIZE is not set +# CONFIG_FEATURE_VI_OPTIMIZE_CURSOR is not set +CONFIG_FEATURE_ALLOW_EXEC=y # # Finding Utilities # # CONFIG_FIND is not set +# CONFIG_FEATURE_FIND_PRINT0 is not set +# CONFIG_FEATURE_FIND_MTIME is not set +# CONFIG_FEATURE_FIND_MMIN is not set +# CONFIG_FEATURE_FIND_PERM is not set +# CONFIG_FEATURE_FIND_TYPE is not set +# CONFIG_FEATURE_FIND_XDEV is not set +# CONFIG_FEATURE_FIND_MAXDEPTH is not set +# CONFIG_FEATURE_FIND_NEWER is not set +# CONFIG_FEATURE_FIND_INUM is not set +# CONFIG_FEATURE_FIND_EXEC is not set +# CONFIG_FEATURE_FIND_USER is not set +# CONFIG_FEATURE_FIND_GROUP is not set +# CONFIG_FEATURE_FIND_NOT is not set +# CONFIG_FEATURE_FIND_DEPTH is not set +# CONFIG_FEATURE_FIND_PAREN is not set +# CONFIG_FEATURE_FIND_SIZE is not set +# CONFIG_FEATURE_FIND_PRUNE is not set +# CONFIG_FEATURE_FIND_DELETE is not set +# CONFIG_FEATURE_FIND_PATH is not set +# CONFIG_FEATURE_FIND_REGEX is not set +# CONFIG_FEATURE_FIND_CONTEXT is not set # CONFIG_GREP is not set +# CONFIG_FEATURE_GREP_EGREP_ALIAS is not set +# CONFIG_FEATURE_GREP_FGREP_ALIAS is not set +# CONFIG_FEATURE_GREP_CONTEXT is not set # CONFIG_XARGS is not set +# CONFIG_FEATURE_XARGS_SUPPORT_CONFIRMATION is not set +# CONFIG_FEATURE_XARGS_SUPPORT_QUOTES is not set +# CONFIG_FEATURE_XARGS_SUPPORT_TERMOPT is not set +# CONFIG_FEATURE_XARGS_SUPPORT_ZERO_TERM is not set # # Init Utilities # CONFIG_INIT=y +# CONFIG_DEBUG_INIT is not set # CONFIG_FEATURE_USE_INITTAB is not set +# CONFIG_FEATURE_KILL_REMOVED is not set +CONFIG_FEATURE_KILL_DELAY=0 +# CONFIG_FEATURE_INIT_SCTTY is not set +# CONFIG_FEATURE_INIT_SYSLOG is not set +CONFIG_FEATURE_EXTRA_QUIET=y +# CONFIG_FEATURE_INIT_COREDUMPS is not set CONFIG_FEATURE_INITRD=y -# CONFIG_FEATURE_INIT_COREDUMPS is not set -CONFIG_FEATURE_EXTRA_QUIET=y # CONFIG_HALT is not set -# CONFIG_POWEROFF is not set -# CONFIG_REBOOT is not set # CONFIG_MESG is not set # # Login/Password Management Utilities # +# CONFIG_FEATURE_SHADOWPASSWDS is not set +# CONFIG_USE_BB_SHADOW is not set # CONFIG_USE_BB_PWD_GRP is not set # CONFIG_ADDGROUP is not set +# CONFIG_FEATURE_ADDUSER_TO_GROUP is not set # CONFIG_DELGROUP is not set +# CONFIG_FEATURE_DEL_USER_FROM_GROUP is not set +# CONFIG_FEATURE_CHECK_NAMES is not set # CONFIG_ADDUSER is not set +# CONFIG_FEATURE_ADDUSER_LONG_OPTIONS is not set # CONFIG_DELUSER is not set # CONFIG_GETTY is not set +# CONFIG_FEATURE_UTMP is not set +# CONFIG_FEATURE_WTMP is not set # CONFIG_LOGIN is not set +# CONFIG_PAM is not set +# CONFIG_LOGIN_SCRIPTS is not set +# CONFIG_FEATURE_NOLOGIN is not set +# CONFIG_FEATURE_SECURETTY is not set # CONFIG_PASSWD is not set +# CONFIG_FEATURE_PASSWD_WEAK_CHECK is not set +# CONFIG_CRYPTPW is not set +# CONFIG_CHPASSWD is not set # CONFIG_SU is not set +# CONFIG_FEATURE_SU_SYSLOG is not set +# CONFIG_FEATURE_SU_CHECKS_SHELLS is not set # CONFIG_SULOGIN is not set # CONFIG_VLOCK is not set # +# Linux Ext2 FS Progs +# +# CONFIG_CHATTR is not set +# CONFIG_FSCK is not set +# CONFIG_LSATTR is not set + +# +# Linux Module Utilities +# +CONFIG_INSMOD=y +# CONFIG_FEATURE_INSMOD_VERSION_CHECKING is not set +# CONFIG_FEATURE_INSMOD_KSYMOOPS_SYMBOLS is not set +# CONFIG_FEATURE_INSMOD_LOADINKMEM is not set +# CONFIG_FEATURE_INSMOD_LOAD_MAP is not set +# CONFIG_FEATURE_INSMOD_LOAD_MAP_FULL is not set +CONFIG_RMMOD=y +CONFIG_LSMOD=y +# CONFIG_FEATURE_LSMOD_PRETTY_2_6_OUTPUT is not set +# CONFIG_MODPROBE is not set +# CONFIG_FEATURE_MODPROBE_MULTIPLE_OPTIONS is not set +# CONFIG_FEATURE_MODPROBE_FANCY_ALIAS is not set + +# +# Options common to multiple modutils +# +# CONFIG_FEATURE_CHECK_TAINTED_MODULE is not set +CONFIG_FEATURE_2_4_MODULES=y +CONFIG_FEATURE_2_6_MODULES=y +# CONFIG_FEATURE_QUERY_MODULE_INTERFACE is not set + +# +# Linux System Utilities +# +# CONFIG_DMESG is not set +# CONFIG_FEATURE_DMESG_PRETTY is not set +# CONFIG_FBSET is not set +# CONFIG_FEATURE_FBSET_FANCY is not set +# CONFIG_FEATURE_FBSET_READMODE is not set +# CONFIG_FDFLUSH is not set +# CONFIG_FDFORMAT is not set +# CONFIG_FDISK is not set +CONFIG_FDISK_SUPPORT_LARGE_DISKS=y +# CONFIG_FEATURE_FDISK_WRITABLE is not set +# CONFIG_FEATURE_AIX_LABEL is not set +# CONFIG_FEATURE_SGI_LABEL is not set +# CONFIG_FEATURE_SUN_LABEL is not set +# CONFIG_FEATURE_OSF_LABEL is not set +# CONFIG_FEATURE_FDISK_ADVANCED is not set +# CONFIG_FINDFS is not set +# CONFIG_FREERAMDISK is not set +# CONFIG_FSCK_MINIX is not set +# CONFIG_MKFS_MINIX is not set +# CONFIG_FEATURE_MINIX2 is not set +# CONFIG_GETOPT is not set +# CONFIG_HEXDUMP is not set +# CONFIG_FEATURE_HEXDUMP_REVERSE is not set +# CONFIG_HD is not set +# CONFIG_HWCLOCK is not set +# CONFIG_FEATURE_HWCLOCK_LONG_OPTIONS is not set +# CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS is not set +# CONFIG_IPCRM is not set +# CONFIG_IPCS is not set +CONFIG_LOSETUP=y +# CONFIG_MDEV is not set +# CONFIG_FEATURE_MDEV_CONF is not set +# CONFIG_FEATURE_MDEV_RENAME is not set +# CONFIG_FEATURE_MDEV_EXEC is not set +# CONFIG_FEATURE_MDEV_LOAD_FIRMWARE is not set +# CONFIG_MKSWAP is not set +# CONFIG_FEATURE_MKSWAP_V0 is not set +# CONFIG_MORE is not set +# CONFIG_FEATURE_USE_TERMIOS is not set +# CONFIG_VOLUMEID is not set +# CONFIG_FEATURE_VOLUMEID_EXT is not set +# CONFIG_FEATURE_VOLUMEID_REISERFS is not set +# CONFIG_FEATURE_VOLUMEID_FAT is not set +# CONFIG_FEATURE_VOLUMEID_HFS is not set +# CONFIG_FEATURE_VOLUMEID_JFS is not set +# CONFIG_FEATURE_VOLUMEID_XFS is not set +# CONFIG_FEATURE_VOLUMEID_NTFS is not set +# CONFIG_FEATURE_VOLUMEID_ISO9660 is not set +# CONFIG_FEATURE_VOLUMEID_UDF is not set +# CONFIG_FEATURE_VOLUMEID_LUKS is not set +# CONFIG_FEATURE_VOLUMEID_LINUXSWAP is not set +# CONFIG_FEATURE_VOLUMEID_CRAMFS is not set +# CONFIG_FEATURE_VOLUMEID_ROMFS is not set +# CONFIG_FEATURE_VOLUMEID_SYSV is not set +# CONFIG_FEATURE_VOLUMEID_OCFS2 is not set +# CONFIG_FEATURE_VOLUMEID_LINUXRAID is not set +CONFIG_MOUNT=y +# CONFIG_FEATURE_MOUNT_FAKE is not set +# CONFIG_FEATURE_MOUNT_VERBOSE is not set +# CONFIG_FEATURE_MOUNT_HELPERS is not set +# CONFIG_FEATURE_MOUNT_LABEL is not set +# CONFIG_FEATURE_MOUNT_NFS is not set +# CONFIG_FEATURE_MOUNT_CIFS is not set +CONFIG_FEATURE_MOUNT_FLAGS=y +CONFIG_FEATURE_MOUNT_FSTAB=y +# CONFIG_PIVOT_ROOT is not set +# CONFIG_RDATE is not set +# CONFIG_READPROFILE is not set +# CONFIG_RTCWAKE is not set +# CONFIG_SETARCH is not set +# CONFIG_SWAPONOFF is not set +# CONFIG_SWITCH_ROOT is not set +CONFIG_UMOUNT=y +# CONFIG_FEATURE_UMOUNT_ALL is not set + +# +# Common options for mount/umount +# +# CONFIG_FEATURE_MOUNT_LOOP is not set +# CONFIG_FEATURE_MTAB_SUPPORT is not set + +# # Miscellaneous Utilities # # CONFIG_ADJTIMEX is not set +# CONFIG_BBCONFIG is not set +# CONFIG_CHAT is not set +# CONFIG_FEATURE_CHAT_NOFAIL is not set +# CONFIG_FEATURE_CHAT_TTY_HIFI is not set +# CONFIG_FEATURE_CHAT_IMPLICIT_CR is not set +# CONFIG_FEATURE_CHAT_SWALLOW_OPTS is not set +# CONFIG_FEATURE_CHAT_SEND_ESCAPES is not set +# CONFIG_FEATURE_CHAT_VAR_ABORT_LEN is not set +# CONFIG_FEATURE_CHAT_CLR_ABORT is not set +# CONFIG_CHRT is not set # CONFIG_CROND is not set +# CONFIG_DEBUG_CROND_OPTION is not set +# CONFIG_FEATURE_CROND_CALL_SENDMAIL is not set # CONFIG_CRONTAB is not set # CONFIG_DC is not set # CONFIG_DEVFSD is not set +# CONFIG_DEVFSD_MODLOAD is not set +# CONFIG_DEVFSD_FG_NP is not set +# CONFIG_DEVFSD_VERBOSE is not set +# CONFIG_FEATURE_DEVFS is not set +# CONFIG_EJECT is not set +# CONFIG_FEATURE_EJECT_SCSI is not set # CONFIG_LAST is not set +# CONFIG_LESS is not set +CONFIG_FEATURE_LESS_MAXLINES= +# CONFIG_FEATURE_LESS_BRACKETS is not set +# CONFIG_FEATURE_LESS_FLAGS is not set +# CONFIG_FEATURE_LESS_FLAGCS is not set +# CONFIG_FEATURE_LESS_MARKS is not set +# CONFIG_FEATURE_LESS_REGEXP is not set # CONFIG_HDPARM is not set +# CONFIG_FEATURE_HDPARM_GET_IDENTITY is not set +# CONFIG_FEATURE_HDPARM_HDIO_SCAN_HWIF is not set +# CONFIG_FEATURE_HDPARM_HDIO_UNREGISTER_HWIF is not set +# CONFIG_FEATURE_HDPARM_HDIO_DRIVE_RESET is not set +# CONFIG_FEATURE_HDPARM_HDIO_TRISTATE_HWIF is not set +# CONFIG_FEATURE_HDPARM_HDIO_GETSET_DMA is not set # CONFIG_MAKEDEVS is not set +# CONFIG_FEATURE_MAKEDEVS_LEAF is not set +# CONFIG_FEATURE_MAKEDEVS_TABLE is not set +# CONFIG_MICROCOM is not set +# CONFIG_MOUNTPOINT is not set # CONFIG_MT is not set +# CONFIG_RAIDAUTORUN is not set +# CONFIG_READAHEAD is not set +# CONFIG_RUNLEVEL is not set # CONFIG_RX is not set +# CONFIG_SCRIPT is not set # CONFIG_STRINGS is not set +# CONFIG_SETSID is not set +# CONFIG_TASKSET is not set +# CONFIG_FEATURE_TASKSET_FANCY is not set # CONFIG_TIME is not set +# CONFIG_TTYSIZE is not set # CONFIG_WATCHDOG is not set # -# Linux Module Utilities -# -CONFIG_MODUTILS=y -CONFIG_MODUTILS_OBJ=y -CONFIG_MODUTILS_OBJ_2_6=y -# CONFIG_DEPMOD is not set -CONFIG_INSMOD=y -CONFIG_FEATURE_2_4_MODULES=y -CONFIG_FEATURE_2_6_MODULES=y -# CONFIG_FEATURE_INSMOD_VERSION_CHECKING is not set -# CONFIG_FEATURE_INSMOD_KSYMOOPS_SYMBOLS is not set -# CONFIG_FEATURE_INSMOD_LOAD_MAP is not set -CONFIG_LSMOD=y -# CONFIG_FEATURE_QUERY_MODULE_INTERFACE is not set -# CONFIG_MODPROBE is not set -CONFIG_RMMOD=y -# CONFIG_FEATURE_CHECK_TAINTED_MODULE is not set - -# # Networking Utilities # # CONFIG_FEATURE_IPV6 is not set +# CONFIG_FEATURE_PREFER_IPV4_ADDRESS is not set +# CONFIG_VERBOSE_RESOLUTION_ERRORS is not set +# CONFIG_ARP is not set # CONFIG_ARPING is not set +# CONFIG_BRCTL is not set +# CONFIG_FEATURE_BRCTL_FANCY is not set +# CONFIG_DNSD is not set +# CONFIG_ETHER_WAKE is not set +# CONFIG_FAKEIDENTD is not set # CONFIG_FTPGET is not set # CONFIG_FTPPUT is not set +# CONFIG_FEATURE_FTPGETPUT_LONG_OPTIONS is not set # CONFIG_HOSTNAME is not set # CONFIG_HTTPD is not set +# CONFIG_FEATURE_HTTPD_RANGES is not set +# CONFIG_FEATURE_HTTPD_USE_SENDFILE is not set +# CONFIG_FEATURE_HTTPD_RELOAD_CONFIG_SIGHUP is not set +# CONFIG_FEATURE_HTTPD_SETUID is not set +# CONFIG_FEATURE_HTTPD_BASIC_AUTH is not set +# CONFIG_FEATURE_HTTPD_AUTH_MD5 is not set +# CONFIG_FEATURE_HTTPD_CONFIG_WITH_MIME_TYPES is not set +# CONFIG_FEATURE_HTTPD_CGI is not set +# CONFIG_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR is not set +# CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV is not set +# CONFIG_FEATURE_HTTPD_ENCODE_URL_STR is not set +# CONFIG_FEATURE_HTTPD_ERROR_PAGES is not set +# CONFIG_FEATURE_HTTPD_PROXY is not set # CONFIG_IFCONFIG is not set +# CONFIG_FEATURE_IFCONFIG_STATUS is not set +# CONFIG_FEATURE_IFCONFIG_SLIP is not set +# CONFIG_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ is not set +# CONFIG_FEATURE_IFCONFIG_HW is not set +# CONFIG_FEATURE_IFCONFIG_BROADCAST_PLUS is not set +# CONFIG_IFENSLAVE is not set # CONFIG_IFUPDOWN is not set +CONFIG_IFUPDOWN_IFSTATE_PATH="" +# CONFIG_FEATURE_IFUPDOWN_IP is not set +# CONFIG_FEATURE_IFUPDOWN_IP_BUILTIN is not set +# CONFIG_FEATURE_IFUPDOWN_IFCONFIG_BUILTIN is not set +# CONFIG_FEATURE_IFUPDOWN_IPV4 is not set +# CONFIG_FEATURE_IFUPDOWN_IPV6 is not set +# CONFIG_FEATURE_IFUPDOWN_MAPPING is not set +# CONFIG_FEATURE_IFUPDOWN_EXTERNAL_DHCP is not set # CONFIG_INETD is not set +# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_ECHO is not set +# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DISCARD is not set +# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_TIME is not set +# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DAYTIME is not set +# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_CHARGEN is not set +# CONFIG_FEATURE_INETD_RPC is not set # CONFIG_IP is not set -# CONFIG_IPCALC is not set +# CONFIG_FEATURE_IP_ADDRESS is not set +# CONFIG_FEATURE_IP_LINK is not set +# CONFIG_FEATURE_IP_ROUTE is not set +# CONFIG_FEATURE_IP_TUNNEL is not set +# CONFIG_FEATURE_IP_RULE is not set +# CONFIG_FEATURE_IP_SHORT_FORMS is not set +# CONFIG_FEATURE_IP_RARE_PROTOCOLS is not set # CONFIG_IPADDR is not set # CONFIG_IPLINK is not set # CONFIG_IPROUTE is not set # CONFIG_IPTUNNEL is not set +# CONFIG_IPRULE is not set +# CONFIG_IPCALC is not set +# CONFIG_FEATURE_IPCALC_FANCY is not set +# CONFIG_FEATURE_IPCALC_LONG_OPTIONS is not set # CONFIG_NAMEIF is not set +# CONFIG_FEATURE_NAMEIF_EXTENDED is not set # CONFIG_NC is not set +# CONFIG_NC_SERVER is not set +# CONFIG_NC_EXTRA is not set # CONFIG_NETSTAT is not set +# CONFIG_FEATURE_NETSTAT_WIDE is not set # CONFIG_NSLOOKUP is not set # CONFIG_PING is not set +# CONFIG_PING6 is not set +# CONFIG_FEATURE_FANCY_PING is not set +# CONFIG_PSCAN is not set # CONFIG_ROUTE is not set +# CONFIG_SENDMAIL is not set +# CONFIG_FETCHMAIL is not set +# CONFIG_SLATTACH is not set # CONFIG_TELNET is not set +# CONFIG_FEATURE_TELNET_TTYPE is not set +# CONFIG_FEATURE_TELNET_AUTOLOGIN is not set # CONFIG_TELNETD is not set +# CONFIG_FEATURE_TELNETD_STANDALONE is not set # CONFIG_TFTP is not set +# CONFIG_TFTPD is not set +# CONFIG_FEATURE_TFTP_GET is not set +# CONFIG_FEATURE_TFTP_PUT is not set +# CONFIG_FEATURE_TFTP_BLOCKSIZE is not set +# CONFIG_DEBUG_TFTP is not set # CONFIG_TRACEROUTE is not set +# CONFIG_FEATURE_TRACEROUTE_VERBOSE is not set +# CONFIG_FEATURE_TRACEROUTE_SOURCE_ROUTE is not set +# CONFIG_FEATURE_TRACEROUTE_USE_ICMP is not set +# CONFIG_APP_UDHCPD is not set +# CONFIG_APP_DHCPRELAY is not set +# CONFIG_APP_DUMPLEASES is not set +# CONFIG_FEATURE_UDHCPD_WRITE_LEASES_EARLY is not set +CONFIG_DHCPD_LEASES_FILE="" +# CONFIG_APP_UDHCPC is not set +# CONFIG_FEATURE_UDHCPC_ARPING is not set +# CONFIG_FEATURE_UDHCP_PORT is not set +# CONFIG_FEATURE_UDHCP_DEBUG is not set +# CONFIG_FEATURE_RFC3397 is not set +CONFIG_DHCPC_DEFAULT_SCRIPT="" +CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS= # CONFIG_VCONFIG is not set # CONFIG_WGET is not set +# CONFIG_FEATURE_WGET_STATUSBAR is not set +# CONFIG_FEATURE_WGET_AUTHENTICATION is not set +# CONFIG_FEATURE_WGET_LONG_OPTIONS is not set +# CONFIG_ZCIP is not set +# CONFIG_TCPSVD is not set +# CONFIG_UDPSVD is not set # -# udhcp Server/Client -# -# CONFIG_UDHCPD is not set -# CONFIG_UDHCPC is not set - -# # Process Utilities # # CONFIG_FREE is not set +# CONFIG_FUSER is not set # CONFIG_KILL is not set +# CONFIG_KILLALL is not set +# CONFIG_KILLALL5 is not set +# CONFIG_NMETER is not set +# CONFIG_PGREP is not set # CONFIG_PIDOF is not set +# CONFIG_FEATURE_PIDOF_SINGLE is not set +# CONFIG_FEATURE_PIDOF_OMIT is not set +# CONFIG_PKILL is not set # CONFIG_PS is not set +# CONFIG_FEATURE_PS_WIDE is not set +# CONFIG_FEATURE_PS_TIME is not set +# CONFIG_FEATURE_PS_UNUSUAL_SYSTEMS is not set # CONFIG_RENICE is not set +# CONFIG_BB_SYSCTL is not set # CONFIG_TOP is not set +# CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE is not set +# CONFIG_FEATURE_TOP_CPU_GLOBAL_PERCENTS is not set +# CONFIG_FEATURE_TOP_DECIMALS is not set +# CONFIG_FEATURE_TOPMEM is not set # CONFIG_UPTIME is not set -# CONFIG_SYSCTL is not set +# CONFIG_WATCH is not set # -# Another Bourne-like Shell +# Shells # CONFIG_FEATURE_SH_IS_ASH=y # CONFIG_FEATURE_SH_IS_HUSH is not set -# CONFIG_FEATURE_SH_IS_LASH is not set # CONFIG_FEATURE_SH_IS_MSH is not set # CONFIG_FEATURE_SH_IS_NONE is not set CONFIG_ASH=y @@ -309,14 +741,26 @@ # Ash Shell Options # CONFIG_ASH_JOB_CONTROL=y +# CONFIG_ASH_READ_NCHARS is not set +# CONFIG_ASH_READ_TIMEOUT is not set # CONFIG_ASH_ALIAS is not set # CONFIG_ASH_MATH_SUPPORT is not set +# CONFIG_ASH_MATH_SUPPORT_64 is not set # CONFIG_ASH_GETOPTS is not set +CONFIG_ASH_BUILTIN_ECHO=y +CONFIG_ASH_BUILTIN_TEST=y # CONFIG_ASH_CMDCMD is not set # CONFIG_ASH_MAIL is not set CONFIG_ASH_OPTIMIZE_FOR_SIZE=y # CONFIG_ASH_RANDOM_SUPPORT is not set +# CONFIG_ASH_EXPAND_PRMT is not set # CONFIG_HUSH is not set +# CONFIG_HUSH_HELP is not set +# CONFIG_HUSH_INTERACTIVE is not set +# CONFIG_HUSH_JOB is not set +# CONFIG_HUSH_TICK is not set +# CONFIG_HUSH_IF is not set +# CONFIG_HUSH_LOOPS is not set # CONFIG_LASH is not set # CONFIG_MSH is not set @@ -324,48 +768,54 @@ # Bourne Shell Options # # CONFIG_FEATURE_SH_EXTRA_QUIET is not set -# CONFIG_FEATURE_SH_STANDALONE_SHELL is not set -# CONFIG_FEATURE_COMMAND_EDITING is not set +# CONFIG_FEATURE_SH_STANDALONE is not set +# CONFIG_CTTYHACK is not set # # System Logging Utilities # # CONFIG_SYSLOGD is not set +# CONFIG_FEATURE_ROTATE_LOGFILE is not set +# CONFIG_FEATURE_REMOTE_LOG is not set +# CONFIG_FEATURE_SYSLOGD_DUP is not set +# CONFIG_FEATURE_IPC_SYSLOG is not set +CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE= +# CONFIG_LOGREAD is not set +# CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING is not set +# CONFIG_KLOGD is not set # CONFIG_LOGGER is not set # -# Linux System Utilities +# Runit Utilities # -# CONFIG_DMESG is not set -# CONFIG_FBSET is not set -# CONFIG_FDFLUSH is not set -# CONFIG_FDFORMAT is not set -# CONFIG_FDISK is not set -FDISK_SUPPORT_LARGE_DISKS=y -# CONFIG_FREERAMDISK is not set -# CONFIG_FSCK_MINIX is not set -# CONFIG_MKFS_MINIX is not set -# CONFIG_GETOPT is not set -# CONFIG_HEXDUMP is not set -# CONFIG_HWCLOCK is not set -CONFIG_LOSETUP=y -# CONFIG_MKSWAP is not set -# CONFIG_MORE is not set -# CONFIG_PIVOT_ROOT is not set -# CONFIG_RDATE is not set -# CONFIG_SWAPONOFF is not set -CONFIG_MOUNT=y -# CONFIG_NFSMOUNT is not set -CONFIG_UMOUNT=y -# CONFIG_FEATURE_MOUNT_FORCE is not set +# CONFIG_RUNSV is not set +# CONFIG_RUNSVDIR is not set +# CONFIG_SV is not set +# CONFIG_SVLOGD is not set +# CONFIG_CHPST is not set +# CONFIG_SETUIDGID is not set +# CONFIG_ENVUIDGID is not set +# CONFIG_ENVDIR is not set +# CONFIG_SOFTLIMIT is not set +# CONFIG_CHCON is not set +# CONFIG_FEATURE_CHCON_LONG_OPTIONS is not set +# CONFIG_GETENFORCE is not set +# CONFIG_GETSEBOOL is not set +# CONFIG_LOAD_POLICY is not set +# CONFIG_MATCHPATHCON is not set +# CONFIG_RESTORECON is not set +# CONFIG_RUNCON is not set +# CONFIG_FEATURE_RUNCON_LONG_OPTIONS is not set +# CONFIG_SELINUXENABLED is not set +# CONFIG_SETENFORCE is not set +# CONFIG_SETFILES is not set +# CONFIG_FEATURE_SETFILES_CHECK_OPTION is not set +# CONFIG_SETSEBOOL is not set +# CONFIG_SESTATUS is not set # -# Common options for mount/umount +# Print Utilities # -# CONFIG_FEATURE_MOUNT_LOOP is not set -# CONFIG_FEATURE_MTAB_SUPPORT is not set - -# -# Debugging Options -# -# CONFIG_DEBUG is not set +# CONFIG_LPD is not set +# CONFIG_LPR is not set +# CONFIG_LPQ is not set Modified: trunk/scripts-base/miniroot/busybox/debian/control =================================================================== --- trunk/scripts-base/miniroot/busybox/debian/control 2009-01-26 13:17:21 UTC (rev 2643) +++ trunk/scripts-base/miniroot/busybox/debian/control 2009-01-26 22:52:51 UTC (rev 2644) @@ -2,7 +2,7 @@ Priority: optional Maintainer: Debian Install System Team <deb...@li...> Uploaders: Erik Andersen <and...@de...>, Bastian Blank <wa...@de...> -Build-Depends: debhelper (>= 4.0.0), di-packages-build (>= 0.5) +Build-Depends: debhelper (>= 4.2) Standards-Version: 3.6.1 Package: busybox-morphix-udeb Modified: trunk/scripts-base/miniroot/busybox/debian/rules =================================================================== --- trunk/scripts-base/miniroot/busybox/debian/rules 2009-01-26 13:17:21 UTC (rev 2643) +++ trunk/scripts-base/miniroot/busybox/debian/rules 2009-01-26 22:52:51 UTC (rev 2644) @@ -27,8 +27,8 @@ CONFIG = $(firstword $(wildcard ./debian/config-$(1)-$(DEB_HOST_GNU_SYSTEM)-$(DEB_HOST_GNU_CPU) ./debian/config-$(1)-$(DEB_HOST_GNU_SYSTEM) ./debian/config-$(1))) CONFIG_UDEB = $(call CONFIG,udeb-morphix) -config.status: configure - sh ./configure +config.status: + echo "Bla" build-arch: build-arch-udeb-all build-arch-udeb-all: build-arch-udeb @@ -45,30 +45,34 @@ $(MAKE) $(MAKE) PREFIX=$(CURDIR)/install-$(PACKAGE_PREFIX)-udeb install - rm -f $(CURDIR)/install-$(PACKAGE_PREFIX)-udeb/sbin/init - rm -f $(CURDIR)/install-$(PACKAGE_PREFIX)-udeb/linuxrc - mkdir $(CURDIR)/install-$(PACKAGE_PREFIX)-udeb/static - mv $(CURDIR)/install-$(PACKAGE_PREFIX)-udeb/bin/* $(CURDIR)/install-$(PACKAGE_PREFIX)-udeb/static - ln -s busybox $(CURDIR)/install-$(PACKAGE_PREFIX)-udeb/static/insmod - ln -s busybox $(CURDIR)/install-$(PACKAGE_PREFIX)-udeb/static/md5sum - ln -s busybox $(CURDIR)/install-$(PACKAGE_PREFIX)-udeb/static/test + rm -rf $(CURDIR)/install-$(PACKAGE_PREFIX)-udeb + mkdir -p $(CURDIR)/install-$(PACKAGE_PREFIX)-udeb/static + mv $(CURDIR)/busybox $(CURDIR)/install-$(PACKAGE_PREFIX)-udeb/static + + ln -s busybox $(CURDIR)/install-$(PACKAGE_PREFIX)-udeb/static/[ + ln -s busybox $(CURDIR)/install-$(PACKAGE_PREFIX)-udeb/static/awk ln -s busybox $(CURDIR)/install-$(PACKAGE_PREFIX)-udeb/static/expr - ln -s busybox $(CURDIR)/install-$(PACKAGE_PREFIX)-udeb/static/[ ln -s busybox $(CURDIR)/install-$(PACKAGE_PREFIX)-udeb/static/egrep ln -s busybox $(CURDIR)/install-$(PACKAGE_PREFIX)-udeb/static/ifconfig + ln -s busybox $(CURDIR)/install-$(PACKAGE_PREFIX)-udeb/static/insmod ln -s busybox $(CURDIR)/install-$(PACKAGE_PREFIX)-udeb/static/find + ln -s busybox $(CURDIR)/install-$(PACKAGE_PREFIX)-udeb/static/losetup + ln -s busybox $(CURDIR)/install-$(PACKAGE_PREFIX)-udeb/static/lsmod + ln -s busybox $(CURDIR)/install-$(PACKAGE_PREFIX)-udeb/static/md5sum ln -s busybox $(CURDIR)/install-$(PACKAGE_PREFIX)-udeb/static/modprobe - ln -s busybox $(CURDIR)/install-$(PACKAGE_PREFIX)-udeb/static/lsmod ln -s busybox $(CURDIR)/install-$(PACKAGE_PREFIX)-udeb/static/rmmod - ln -s busybox $(CURDIR)/install-$(PACKAGE_PREFIX)-udeb/static/losetup ln -s busybox $(CURDIR)/install-$(PACKAGE_PREFIX)-udeb/static/route + ln -s busybox $(CURDIR)/install-$(PACKAGE_PREFIX)-udeb/static/sed ln -s busybox $(CURDIR)/install-$(PACKAGE_PREFIX)-udeb/static/swapoff ln -s busybox $(CURDIR)/install-$(PACKAGE_PREFIX)-udeb/static/swapon + ln -s busybox $(CURDIR)/install-$(PACKAGE_PREFIX)-udeb/static/tail + ln -s busybox $(CURDIR)/install-$(PACKAGE_PREFIX)-udeb/static/test ln -s busybox $(CURDIR)/install-$(PACKAGE_PREFIX)-udeb/static/tty + ln -s busybox $(CURDIR)/install-$(PACKAGE_PREFIX)-udeb/static/tr ln -s busybox $(CURDIR)/install-$(PACKAGE_PREFIX)-udeb/static/wget - rm -r $(CURDIR)/install-$(PACKAGE_PREFIX)-udeb/bin - rm -r $(CURDIR)/install-$(PACKAGE_PREFIX)-udeb/sbin - rm -r $(CURDIR)/install-$(PACKAGE_PREFIX)-udeb/usr + rm -fr $(CURDIR)/install-$(PACKAGE_PREFIX)-udeb/bin + rm -fr $(CURDIR)/install-$(PACKAGE_PREFIX)-udeb/sbin + rm -fr $(CURDIR)/install-$(PACKAGE_PREFIX)-udeb/usr touch $@ build: build-arch @@ -109,8 +113,8 @@ dh_fixperms $(DEBHELPER_PACKAGES_UDEB) dh_installdeb $(DEBHELPER_PACKAGES_UDEB) dh_shlibdeps $(DEBHELPER_PACKAGES_UDEB) - dh_di_gencontrol -t udeb - dh_di_builddeb -t udeb + dh_gencontrol + dh_builddeb binary: binary-arch .PHONY: build clean binary-indep binary-arch binary install This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <pa...@us...> - 2009-01-26 13:17:28
|
Revision: 2643 http://morphix.svn.sourceforge.net/morphix/?rev=2643&view=rev Author: paul_c Date: 2009-01-26 13:17:21 +0000 (Mon, 26 Jan 2009) Log Message: ----------- Noticed a debian/rules in /etc/init.d - Either a hangover from earlier work or it is used to build a "real" package. Rather than svn-remove, delete the files and directory when packaging morphix-base-scripts. Modified Paths: -------------- trunk/scripts-base/debian/rules Modified: trunk/scripts-base/debian/rules =================================================================== --- trunk/scripts-base/debian/rules 2009-01-25 20:21:57 UTC (rev 2642) +++ trunk/scripts-base/debian/rules 2009-01-26 13:17:21 UTC (rev 2643) @@ -37,6 +37,7 @@ cd $(CURDIR)/debian/morphix-base-conf && find -name 'CVS' -print0 | xargs -0r rm -rf cd $(CURDIR)/debian/morphix-base-conf && find -name '.svn' -print0 | xargs -0r rm -rf rm -r $(CURDIR)/debian/morphix-base-conf/etc/pcmcia + rm -fr $(CURDIR)/debian/morphix-base-conf/etc/init.d/debian mkdir -p $(CURDIR)/debian/morphix-base-conf-pcmcia/etc/pcmcia cp -vR etc/pcmcia/* $(CURDIR)/debian/morphix-base-conf-pcmcia/etc/pcmcia/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <pa...@us...> - 2009-01-25 20:22:06
|
Revision: 2642 http://morphix.svn.sourceforge.net/morphix/?rev=2642&view=rev Author: paul_c Date: 2009-01-25 20:21:57 +0000 (Sun, 25 Jan 2009) Log Message: ----------- Two Depends: lines for morphix-isomorph makes dpkg-buildpackage barf. Removed the {misc-depends} line (and hope mkisofs | genisoimage is enough). Modified Paths: -------------- trunk/morph-scripts/debian/control Modified: trunk/morph-scripts/debian/control =================================================================== --- trunk/morph-scripts/debian/control 2009-01-25 17:42:01 UTC (rev 2641) +++ trunk/morph-scripts/debian/control 2009-01-25 20:21:57 UTC (rev 2642) @@ -47,7 +47,6 @@ Package: morphix-isomorph Depends: mkisofs | genisoimage Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, mkisofs | genisoimage Description: Adds and removes modules from an iso Provides a large number of arguments to modify existing Morphix CD images. See isomorph --help for details. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |