Menu
▾
▴
morphix-cvs
|
From: <bms...@us...> - 2006-03-21 20:20:43
|
Revision: 2151 Author: bmsleight Date: 2006-03-21 12:20:18 -0800 (Tue, 21 Mar 2006) ViewCVS: http://svn.sourceforge.net/morphix/?rev=2151&view=rev Log Message: ----------- mmaker -c option .... for isomaker Modified Paths: -------------- trunk/how_tos/all_man_pages/all_man_pages.xml trunk/how_tos/all_man_pages/html/ar01s02.html trunk/how_tos/all_man_pages/html/ar01s03.html trunk/how_tos/all_man_pages/html/ar01s04.html trunk/how_tos/all_man_pages/html/ar01s05.html trunk/how_tos/all_man_pages/html/ar01s06.html trunk/how_tos/all_man_pages/html/ar01s07.html trunk/how_tos/all_man_pages/html/ar01s08.html trunk/how_tos/all_man_pages/html/ar01s09.html trunk/how_tos/all_man_pages/html/ar01s10.html trunk/how_tos/all_man_pages/html/ar01s11.html trunk/how_tos/all_man_pages/html/index.html trunk/how_tos/all_man_pages/html/ix01.html trunk/how_tos/all_man_pages/man/isomaker.1 trunk/how_tos/all_man_pages/man_source/isomaker.txt trunk/how_tos/all_man_pages/man_xml/isomaker.xml trunk/mmaker/README.isomaker trunk/mmaker/debian/isomaker.1 Modified: trunk/how_tos/all_man_pages/all_man_pages.xml =================================================================== --- trunk/how_tos/all_man_pages/all_man_pages.xml 2006-03-21 20:06:10 UTC (rev 2150) +++ trunk/how_tos/all_man_pages/all_man_pages.xml 2006-03-21 20:20:18 UTC (rev 2151) @@ -960,7 +960,7 @@ </section> <section> <title>SYNOPSIS</title> -<simpara><emphasis>isomaker</emphasis> -b basemod.xml [-m mainmod.xml] [-m mainmod2.xml] [[-r repository [-p package1] [-p package2]] [-t tarball] output.iso</simpara> +<simpara><emphasis>isomaker</emphasis> -b basemod.xml [-c] [-m mainmod.xml] [-m mainmod2.xml] [[-r repository [-p package1] [-p package2]] [-t tarball] output.iso</simpara> </section> <section> @@ -983,6 +983,16 @@ </varlistentry> <varlistentry> <term> +<emphasis>-c</emphasis> +</term> +<listitem> +<simpara> + Clean temporary directories. +</simpara> +</listitem> +</varlistentry> +<varlistentry> +<term> <emphasis>-m mainmod.xml</emphasis> </term> <listitem> @@ -1029,7 +1039,7 @@ </term> <listitem> <simpara> - tarball to be included on iso. + Use a local debian bootstrap, rather than download from repository. </simpara> </listitem> </varlistentry> @@ -1065,7 +1075,7 @@ </simpara> </listitem> </itemizedlist> -<simpara>isomaker currently doesn't remove the working directories automatically. +<simpara>isomaker currently doesn't remove the working directories automatically, unless -c is used. do a rm -rf /tmp/libmorphix* afterwards to clean up… ($TEMP/libmorphix* if TEMP set)</simpara> <simpara>Your kernel needs to be able to loop-mount filesystems modprobe loop before building to enable this, if loop is compiled as a module</simpara> Modified: trunk/how_tos/all_man_pages/html/ar01s02.html =================================================================== --- trunk/how_tos/all_man_pages/html/ar01s02.html 2006-03-21 20:06:10 UTC (rev 2150) +++ trunk/how_tos/all_man_pages/html/ar01s02.html 2006-03-21 20:20:18 UTC (rev 2151) @@ -1,24 +1,24 @@ -<html><head><meta http-equiv="Content-Type" content="text/html; charset=ANSI_X3.4-1968"><title>Preface</title><meta name="generator" content="DocBook XSL Stylesheets V1.68.1"><link rel="start" href="index.html" title="Morphix Man Pages"><link rel="up" href="index.html" title="Morphix Man Pages"><link rel="prev" href="index.html" title="Morphix Man Pages"><link rel="next" href="ar01s03.html" title="MODULE-BUILDER(1)"><link href="http://www.morphix.org/templates/MorphixORG/css/template_css.css" rel="stylesheet" type="text/css"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">Preface</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="index.html">Prev</a> </td><th width="60%" align="center"> </th><td width="20%" align="right"> <a accesskey="n" href="ar01s03.html">Next</a></td></tr></table><hr></div><div class="section" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="id2504480"></a>Preface</h2></div></div></div><p>This is a DocBook containing all the Morphix man pages.</p><p><a class="indexterm" name="id2504491"></a> +<html><head><meta http-equiv="Content-Type" content="text/html; charset=ANSI_X3.4-1968"><title>Preface</title><meta name="generator" content="DocBook XSL Stylesheets V1.68.1"><link rel="start" href="index.html" title="Morphix Man Pages"><link rel="up" href="index.html" title="Morphix Man Pages"><link rel="prev" href="index.html" title="Morphix Man Pages"><link rel="next" href="ar01s03.html" title="MODULE-BUILDER(1)"><link href="http://www.morphix.org/templates/MorphixORG/css/template_css.css" rel="stylesheet" type="text/css"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">Preface</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="index.html">Prev</a> </td><th width="60%" align="center"> </th><td width="20%" align="right"> <a accesskey="n" href="ar01s03.html">Next</a></td></tr></table><hr></div><div class="section" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="id2504490"></a>Preface</h2></div></div></div><p>This is a DocBook containing all the Morphix man pages.</p><p><a class="indexterm" name="id2504501"></a> <span class="emphasis"><em>- module-builder (morphix-modulebuilder)</em></span> - Constructs a module from a directory</p><p><a class="indexterm" name="id2504505"></a> + Constructs a module from a directory</p><p><a class="indexterm" name="id2504515"></a> <span class="emphasis"><em>- module-extractor (morphix-moduleextractor)</em></span> - Extracts files from a module to a directory</p><p><a class="indexterm" name="id2465961"></a> + Extracts files from a module to a directory</p><p><a class="indexterm" name="id2465973"></a> <span class="emphasis"><em>- make-iso (morphix-make-iso)</em></span> - Creates a bootable ISO from a directory, detects multiple base versions.</p><p><a class="indexterm" name="id2465976"></a> + Creates a bootable ISO from a directory, detects multiple base versions.</p><p><a class="indexterm" name="id2465988"></a> <span class="emphasis"><em>- isomorph (morphix-isomorph)</em></span> - Lists modules on an ISO, adds or removes modules from an ISO, and more!</p><p><a class="indexterm" name="id2465992"></a> + Lists modules on an ISO, adds or removes modules from an ISO, and more!</p><p><a class="indexterm" name="id2466003"></a> <span class="emphasis"><em>- mmaker (morphix-mmaker)</em></span> Creates a base or main module, using template files. Examples are in /usr/share/mmaker/templates. See <a href="http://www.morphix.org/wiki/index.php/ModuleMaker" target="_top">http://www.morphix.org/wiki/index.php/ModuleMaker</a> -and documentation in /usr/share/doc/mmaker for details.</p><p><a class="indexterm" name="id2466019"></a> +and documentation in /usr/share/doc/mmaker for details.</p><p><a class="indexterm" name="id2466030"></a> <span class="emphasis"><em>- isomaker (morphix-mmaker)</em></span> Creates an iso, using one or more mmaker template files. - See documentation in /usr/share/doc/mmaker for details.</p><p><a class="indexterm" name="id2466038"></a> + See documentation in /usr/share/doc/mmaker for details.</p><p><a class="indexterm" name="id2466049"></a> <span class="emphasis"><em>- make-mini (morphix-mmaker)</em></span> - Commandline tool for building homedir and language minimodules.</p><p><a class="indexterm" name="id2466055"></a> + Commandline tool for building homedir and language minimodules.</p><p><a class="indexterm" name="id2466065"></a> <span class="emphasis"><em>- install2mainmod (morphix-install2mainmod)</em></span> - Converts a running hdd install into a mainmodule.</p><p><a class="indexterm" name="id2466071"></a> + Converts a running hdd install into a mainmodule.</p><p><a class="indexterm" name="id2466082"></a> <span class="emphasis"><em>- minimod-gen (morphix-minimodgen)</em></span> - Provides a commandline interface for building simple minimodules.</p><p><a class="indexterm" name="id2466087"></a> + Provides a commandline interface for building simple minimodules.</p><p><a class="indexterm" name="id2466098"></a> <span class="emphasis"><em>- addtoiso (morphix-addtoiso)</em></span> Add file to an iso, without having to copy the file all within the image</p></div><div class="navfooter"><hr><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"><a accesskey="p" href="index.html">Prev</a> </td><td width="20%" align="center"> </td><td width="40%" align="right"> <a accesskey="n" href="ar01s03.html">Next</a></td></tr><tr><td width="40%" align="left" valign="top">Morphix Man Pages </td><td width="20%" align="center"><a accesskey="h" href="index.html">Home</a></td><td width="40%" align="right" valign="top"> MODULE-BUILDER(1)</td></tr></table></div></body></html> Modified: trunk/how_tos/all_man_pages/html/ar01s03.html =================================================================== --- trunk/how_tos/all_man_pages/html/ar01s03.html 2006-03-21 20:06:10 UTC (rev 2150) +++ trunk/how_tos/all_man_pages/html/ar01s03.html 2006-03-21 20:20:18 UTC (rev 2151) @@ -1,4 +1,4 @@ -<html><head><meta http-equiv="Content-Type" content="text/html; charset=ANSI_X3.4-1968"><title>MODULE-BUILDER(1)</title><meta name="generator" content="DocBook XSL Stylesheets V1.68.1"><link rel="start" href="index.html" title="Morphix Man Pages"><link rel="up" href="index.html" title="Morphix Man Pages"><link rel="prev" href="ar01s02.html" title="Preface"><link rel="next" href="ar01s04.html" title="MODULE-EXTRACTOR(1)"><link href="http://www.morphix.org/templates/MorphixORG/css/template_css.css" rel="stylesheet" type="text/css"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">MODULE-BUILDER(1)</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="ar01s02.html">Prev</a> </td><th width="60%" align="center"> </th><td width="20%" align="right"> <a accesskey="n" href="ar01s04.html">Next</a></td></tr></table><hr></div><div class="section" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="id2466104"></a>MODULE-BUILDER(1)</h2></div></div></div><p>Brendan Sleight <morphix@barwap.spam_removed.com></p><div class="section" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="id2466116"></a>NAME</h3></div></div></div><p>module-builder - builds a morphix module from an unpacked-module-directory</p></div><div class="section" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="id2466127"></a>SYNOPSIS</h3></div></div></div><p><span class="emphasis"><em>module-builder</em></span> [OPTIONS…] unpacked-module-directory outputfile.mod</p></div><div class="section" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="id2466142"></a>DESCRIPTION</h3></div></div></div><p>The module-builder command builds a morphix module <span class="emphasis"><em>outputfile.mod</em></span> from the directory <span class="emphasis"><em>unpacked-module-directory</em></span></p></div><div class="section" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="id2466160"></a>OPTIONS</h3></div></div></div><div class="variablelist"><dl><dt><span class="term"> +<html><head><meta http-equiv="Content-Type" content="text/html; charset=ANSI_X3.4-1968"><title>MODULE-BUILDER(1)</title><meta name="generator" content="DocBook XSL Stylesheets V1.68.1"><link rel="start" href="index.html" title="Morphix Man Pages"><link rel="up" href="index.html" title="Morphix Man Pages"><link rel="prev" href="ar01s02.html" title="Preface"><link rel="next" href="ar01s04.html" title="MODULE-EXTRACTOR(1)"><link href="http://www.morphix.org/templates/MorphixORG/css/template_css.css" rel="stylesheet" type="text/css"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">MODULE-BUILDER(1)</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="ar01s02.html">Prev</a> </td><th width="60%" align="center"> </th><td width="20%" align="right"> <a accesskey="n" href="ar01s04.html">Next</a></td></tr></table><hr></div><div class="section" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="id2466114"></a>MODULE-BUILDER(1)</h2></div></div></div><p>Brendan Sleight <morphix@barwap.spam_removed.com></p><div class="section" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="id2466125"></a>NAME</h3></div></div></div><p>module-builder - builds a morphix module from an unpacked-module-directory</p></div><div class="section" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="id2466137"></a>SYNOPSIS</h3></div></div></div><p><span class="emphasis"><em>module-builder</em></span> [OPTIONS…] unpacked-module-directory outputfile.mod</p></div><div class="section" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="id2466152"></a>DESCRIPTION</h3></div></div></div><p>The module-builder command builds a morphix module <span class="emphasis"><em>outputfile.mod</em></span> from the directory <span class="emphasis"><em>unpacked-module-directory</em></span></p></div><div class="section" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="id2466170"></a>OPTIONS</h3></div></div></div><div class="variablelist"><dl><dt><span class="term"> -l LABEL </span></dt><dd> set the CD label if no label is given (default: Morphix) @@ -14,8 +14,8 @@ iso9660 </span></dt><dd> faster, default. Only overlayable with translucency/mini_fo -</dd></dl></div></dd></dl></div></div><div class="section" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="id2466309"></a>EXAMPLES</h3></div></div></div><div class="variablelist"><dl><dt><span class="term"> +</dd></dl></div></dd></dl></div></div><div class="section" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="id2466247"></a>EXAMPLES</h3></div></div></div><div class="variablelist"><dl><dt><span class="term"> Build a mini-module </span></dt><dd> module-builder /tmp/building-module/ /tmp/Morphix-Mini-1.mod -</dd></dl></div></div><div class="section" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="id2466335"></a>SECURITY</h3></div></div></div><p>Needs to be run as root or via sudo. So has security implications.</p></div><div class="section" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="id2466345"></a>NOTES</h3></div></div></div><p>Morphix is a modular-based liveCD, designed to be easy to modify. The package morphing-tools and morphix-mmaker contains tools to help modify and build morphix-based LiveCDs.</p></div><div class="section" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="id2466358"></a>BUGS</h3></div></div></div><p>Dont panic. If you find one, report it to us, but please make sure you have read all of the documentation first. We have assumed that you have cloop device and have installed the packages morphing-tools and morphix-mmaker.</p></div><div class="section" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="id2466372"></a>AUTHORS</h3></div></div></div><p>Written by Alex de Landgraaf and other Morphix developers. <a href="http://www.morphix.org/" target="_top">Morphix web site</a>. Browse cvs repository[http://sourceforge.net/projects/morphix] and cvs mailing lists for full list of developers and patches submitted.</p><p>This man page was written by Brendan Sleight using <a href="http://www.methods.co.nz/asciidoc/" target="_top">asciidoc</a></p></div><div class="section" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="id2466400"></a>SEE ALSO</h3></div></div></div><p><span class="strong"><strong>module-builder, module-extractor, make-iso, isomorph, mmaker, isomaker, make-mini, install2mainmod, minimod-gen, addtoiso</strong></span></p></div></div><div class="navfooter"><hr><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"><a accesskey="p" href="ar01s02.html">Prev</a> </td><td width="20%" align="center"> </td><td width="40%" align="right"> <a accesskey="n" href="ar01s04.html">Next</a></td></tr><tr><td width="40%" align="left" valign="top">Preface </td><td width="20%" align="center"><a accesskey="h" href="index.html">Home</a></td><td width="40%" align="right" valign="top"> MODULE-EXTRACTOR(1)</td></tr></table></div></body></html> +</dd></dl></div></div><div class="section" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="id2466344"></a>SECURITY</h3></div></div></div><p>Needs to be run as root or via sudo. So has security implications.</p></div><div class="section" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="id2466355"></a>NOTES</h3></div></div></div><p>Morphix is a modular-based liveCD, designed to be easy to modify. The package morphing-tools and morphix-mmaker contains tools to help modify and build morphix-based LiveCDs.</p></div><div class="section" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="id2466368"></a>BUGS</h3></div></div></div><p>Dont panic. If you find one, report it to us, but please make sure you have read all of the documentation first. We have assumed that you have cloop device and have installed the packages morphing-tools and morphix-mmaker.</p></div><div class="section" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="id2466382"></a>AUTHORS</h3></div></div></div><p>Written by Alex de Landgraaf and other Morphix developers. <a href="http://www.morphix.org/" target="_top">Morphix web site</a>. Browse cvs repository[http://sourceforge.net/projects/morphix] and cvs mailing lists for full list of developers and patches submitted.</p><p>This man page was written by Brendan Sleight using <a href="http://www.methods.co.nz/asciidoc/" target="_top">asciidoc</a></p></div><div class="section" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="id2466410"></a>SEE ALSO</h3></div></div></div><p><span class="strong"><strong>module-builder, module-extractor, make-iso, isomorph, mmaker, isomaker, make-mini, install2mainmod, minimod-gen, addtoiso</strong></span></p></div></div><div class="navfooter"><hr><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"><a accesskey="p" href="ar01s02.html">Prev</a> </td><td width="20%" align="center"> </td><td width="40%" align="right"> <a accesskey="n" href="ar01s04.html">Next</a></td></tr><tr><td width="40%" align="left" valign="top">Preface </td><td width="20%" align="center"><a accesskey="h" href="index.html">Home</a></td><td width="40%" align="right" valign="top"> MODULE-EXTRACTOR(1)</td></tr></table></div></body></html> Modified: trunk/how_tos/all_man_pages/html/ar01s04.html =================================================================== --- trunk/how_tos/all_man_pages/html/ar01s04.html 2006-03-21 20:06:10 UTC (rev 2150) +++ trunk/how_tos/all_man_pages/html/ar01s04.html 2006-03-21 20:20:18 UTC (rev 2151) @@ -1,5 +1,5 @@ -<html><head><meta http-equiv="Content-Type" content="text/html; charset=ANSI_X3.4-1968"><title>MODULE-EXTRACTOR(1)</title><meta name="generator" content="DocBook XSL Stylesheets V1.68.1"><link rel="start" href="index.html" title="Morphix Man Pages"><link rel="up" href="index.html" title="Morphix Man Pages"><link rel="prev" href="ar01s03.html" title="MODULE-BUILDER(1)"><link rel="next" href="ar01s05.html" title="MAKE-ISO(1)"><link href="http://www.morphix.org/templates/MorphixORG/css/template_css.css" rel="stylesheet" type="text/css"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">MODULE-EXTRACTOR(1)</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="ar01s03.html">Prev</a> </td><th width="60%" align="center"> </th><td width="20%" align="right"> <a accesskey="n" href="ar01s05.html">Next</a></td></tr></table><hr></div><div class="section" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="id2466416"></a>MODULE-EXTRACTOR(1)</h2></div></div></div><p>Brendan Sleight <morphix@barwap.spam_removed.com></p><div class="section" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="id2466428"></a>NAME</h3></div></div></div><p>module-extractor - extracts a morphix module from an unpacked-module-directory</p></div><div class="section" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="id2466440"></a>SYNOPSIS</h3></div></div></div><p><span class="emphasis"><em>module-extractor</em></span> inputfile.mod unpacked-module-directory</p></div><div class="section" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="id2466453"></a>DESCRIPTION</h3></div></div></div><p>The module-builder command extracts a morphix module <span class="emphasis"><em>inputfile.mod</em></span> to the directory <span class="emphasis"><em>unpacked-module-directory</em></span></p></div><div class="section" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="id2466471"></a>EXAMPLES</h3></div></div></div><div class="variablelist"><dl><dt><span class="term"> +<html><head><meta http-equiv="Content-Type" content="text/html; charset=ANSI_X3.4-1968"><title>MODULE-EXTRACTOR(1)</title><meta name="generator" content="DocBook XSL Stylesheets V1.68.1"><link rel="start" href="index.html" title="Morphix Man Pages"><link rel="up" href="index.html" title="Morphix Man Pages"><link rel="prev" href="ar01s03.html" title="MODULE-BUILDER(1)"><link rel="next" href="ar01s05.html" title="MAKE-ISO(1)"><link href="http://www.morphix.org/templates/MorphixORG/css/template_css.css" rel="stylesheet" type="text/css"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">MODULE-EXTRACTOR(1)</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="ar01s03.html">Prev</a> </td><th width="60%" align="center"> </th><td width="20%" align="right"> <a accesskey="n" href="ar01s05.html">Next</a></td></tr></table><hr></div><div class="section" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="id2466426"></a>MODULE-EXTRACTOR(1)</h2></div></div></div><p>Brendan Sleight <morphix@barwap.spam_removed.com></p><div class="section" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="id2466438"></a>NAME</h3></div></div></div><p>module-extractor - extracts a morphix module from an unpacked-module-directory</p></div><div class="section" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="id2466450"></a>SYNOPSIS</h3></div></div></div><p><span class="emphasis"><em>module-extractor</em></span> inputfile.mod unpacked-module-directory</p></div><div class="section" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="id2466463"></a>DESCRIPTION</h3></div></div></div><p>The module-builder command extracts a morphix module <span class="emphasis"><em>inputfile.mod</em></span> to the directory <span class="emphasis"><em>unpacked-module-directory</em></span></p></div><div class="section" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="id2466481"></a>EXAMPLES</h3></div></div></div><div class="variablelist"><dl><dt><span class="term"> Build a mini-module </span></dt><dd> module-builder /tmp/Morphix-Mini-1.mod /tmp/building-module/ -</dd></dl></div></div><div class="section" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="id2466497"></a>SECURITY</h3></div></div></div><p>Needs to be run as root or via sudo. So has security implications.</p></div><div class="section" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="id2466508"></a>NOTES</h3></div></div></div><p>Morphix is a modular-based liveCD, designed to be easy to modify. The package morphing-tools and morphix-mmaker contains tools to help modify and build morphix-based LiveCDs.</p></div><div class="section" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="id2466521"></a>BUGS</h3></div></div></div><p>Dont panic. If you find one, report it to us, but please make sure you have read all of the documentation first. We have assumed that you have cloop device and have installed the packages morphing-tools and morphix-mmaker.</p></div><div class="section" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="id2466535"></a>AUTHORS</h3></div></div></div><p>Written by Alex de Landgraaf and other Morphix developers. <a href="http://www.morphix.org/" target="_top">Morphix web site</a>. Browse cvs repository[http://sourceforge.net/projects/morphix] and cvs mailing lists for full list of developers and patches submitted.</p><p>This man page was written by Brendan Sleight using <a href="http://www.methods.co.nz/asciidoc/" target="_top">asciidoc</a></p></div><div class="section" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="id2466565"></a>SEE ALSO</h3></div></div></div><p><span class="strong"><strong>module-builder, module-extractor, make-iso, isomorph, mmaker, isomaker, make-mini, install2mainmod, minimod-gen, addtoiso</strong></span></p></div></div><div class="navfooter"><hr><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"><a accesskey="p" href="ar01s03.html">Prev</a> </td><td width="20%" align="center"> </td><td width="40%" align="right"> <a accesskey="n" href="ar01s05.html">Next</a></td></tr><tr><td width="40%" align="left" valign="top">MODULE-BUILDER(1) </td><td width="20%" align="center"><a accesskey="h" href="index.html">Home</a></td><td width="40%" align="right" valign="top"> MAKE-ISO(1)</td></tr></table></div></body></html> +</dd></dl></div></div><div class="section" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="id2466507"></a>SECURITY</h3></div></div></div><p>Needs to be run as root or via sudo. So has security implications.</p></div><div class="section" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="id2466518"></a>NOTES</h3></div></div></div><p>Morphix is a modular-based liveCD, designed to be easy to modify. The package morphing-tools and morphix-mmaker contains tools to help modify and build morphix-based LiveCDs.</p></div><div class="section" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="id2466532"></a>BUGS</h3></div></div></div><p>Dont panic. If you find one, report it to us, but please make sure you have read all of the documentation first. We have assumed that you have cloop device and have installed the packages morphing-tools and morphix-mmaker.</p></div><div class="section" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="id2466546"></a>AUTHORS</h3></div></div></div><p>Written by Alex de Landgraaf and other Morphix developers. <a href="http://www.morphix.org/" target="_top">Morphix web site</a>. Browse cvs repository[http://sourceforge.net/projects/morphix] and cvs mailing lists for full list of developers and patches submitted.</p><p>This man page was written by Brendan Sleight using <a href="http://www.methods.co.nz/asciidoc/" target="_top">asciidoc</a></p></div><div class="section" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="id2466575"></a>SEE ALSO</h3></div></div></div><p><span class="strong"><strong>module-builder, module-extractor, make-iso, isomorph, mmaker, isomaker, make-mini, install2mainmod, minimod-gen, addtoiso</strong></span></p></div></div><div class="navfooter"><hr><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"><a accesskey="p" href="ar01s03.html">Prev</a> </td><td width="20%" align="center"> </td><td width="40%" align="right"> <a accesskey="n" href="ar01s05.html">Next</a></td></tr><tr><td width="40%" align="left" valign="top">MODULE-BUILDER(1) </td><td width="20%" align="center"><a accesskey="h" href="index.html">Home</a></td><td width="40%" align="right" valign="top"> MAKE-ISO(1)</td></tr></table></div></body></html> Modified: trunk/how_tos/all_man_pages/html/ar01s05.html =================================================================== --- trunk/how_tos/all_man_pages/html/ar01s05.html 2006-03-21 20:06:10 UTC (rev 2150) +++ trunk/how_tos/all_man_pages/html/ar01s05.html 2006-03-21 20:20:18 UTC (rev 2151) @@ -1,7 +1,7 @@ -<html><head><meta http-equiv="Content-Type" content="text/html; charset=ANSI_X3.4-1968"><title>MAKE-ISO(1)</title><meta name="generator" content="DocBook XSL Stylesheets V1.68.1"><link rel="start" href="index.html" title="Morphix Man Pages"><link rel="up" href="index.html" title="Morphix Man Pages"><link rel="prev" href="ar01s04.html" title="MODULE-EXTRACTOR(1)"><link rel="next" href="ar01s06.html" title="ISOMORPH(1)"><link href="http://www.morphix.org/templates/MorphixORG/css/template_css.css" rel="stylesheet" type="text/css"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">MAKE-ISO(1)</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="ar01s04.html">Prev</a> </td><th width="60%" align="center"> </th><td width="20%" align="right"> <a accesskey="n" href="ar01s06.html">Next</a></td></tr></table><hr></div><div class="section" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="id2466581"></a>MAKE-ISO(1)</h2></div></div></div><p>Brendan Sleight <morphix@barwap.spam_removed.com></p><div class="section" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="id2466593"></a>NAME</h3></div></div></div><p>make-iso - make an morphix iso from sourcedirectory</p></div><div class="section" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="id2466819"></a>SYNOPSIS</h3></div></div></div><p><span class="emphasis"><em>make-iso</em></span> sourcedirectory destination.iso</p></div><div class="section" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="id2466832"></a>DESCRIPTION</h3></div></div></div><p>This script generates internal md5sum file for the sourcedirectory +<html><head><meta http-equiv="Content-Type" content="text/html; charset=ANSI_X3.4-1968"><title>MAKE-ISO(1)</title><meta name="generator" content="DocBook XSL Stylesheets V1.68.1"><link rel="start" href="index.html" title="Morphix Man Pages"><link rel="up" href="index.html" title="Morphix Man Pages"><link rel="prev" href="ar01s04.html" title="MODULE-EXTRACTOR(1)"><link rel="next" href="ar01s06.html" title="ISOMORPH(1)"><link href="http://www.morphix.org/templates/MorphixORG/css/template_css.css" rel="stylesheet" type="text/css"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">MAKE-ISO(1)</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="ar01s04.html">Prev</a> </td><th width="60%" align="center"> </th><td width="20%" align="right"> <a accesskey="n" href="ar01s06.html">Next</a></td></tr></table><hr></div><div class="section" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="id2466591"></a>MAKE-ISO(1)</h2></div></div></div><p>Brendan Sleight <morphix@barwap.spam_removed.com></p><div class="section" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="id2466603"></a>NAME</h3></div></div></div><p>make-iso - make an morphix iso from sourcedirectory</p></div><div class="section" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="id2466614"></a>SYNOPSIS</h3></div></div></div><p><span class="emphasis"><em>make-iso</em></span> sourcedirectory destination.iso</p></div><div class="section" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="id2466842"></a>DESCRIPTION</h3></div></div></div><p>This script generates internal md5sum file for the sourcedirectory and then generates a bootable live CD from the <span class="emphasis"><em>sourcedirectory</em></span> -Naturally, destination.iso is the output</p></div><div class="section" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="id2466850"></a>EXAMPLES</h3></div></div></div><div class="variablelist"><dl><dt><span class="term"> +Naturally, destination.iso is the output</p></div><div class="section" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="id2466860"></a>EXAMPLES</h3></div></div></div><div class="variablelist"><dl><dt><span class="term"> Build a mini-module </span></dt><dd> make-iso /tmp/morphix-cd-files/ /tmp/Morphix-cd.iso -</dd></dl></div></div><div class="section" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="id2466876"></a>SECURITY</h3></div></div></div><p>Needs to be run as root or via sudo. So has security implications.</p></div><div class="section" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="id2466887"></a>NOTES</h3></div></div></div><p>Morphix is a modular-based liveCD, designed to be easy to modify. The package morphing-tools and morphix-mmaker contains tools to help modify and build morphix-based LiveCDs.</p></div><div class="section" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="id2466900"></a>BUGS</h3></div></div></div><p>Dont panic. If you find one, report it to us, but please make sure you have read all of the documentation first. We have assumed that you have cloop device and have installed the packages morphing-tools and morphix-mmaker.</p></div><div class="section" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="id2466914"></a>AUTHORS</h3></div></div></div><p>Written by Alex de Landgraaf and other Morphix developers. <a href="http://www.morphix.org/" target="_top">Morphix web site</a>. Browse cvs repository[http://sourceforge.net/projects/morphix] and cvs mailing lists for full list of developers and patches submitted.</p><p>This man page was written by Brendan Sleight using <a href="http://www.methods.co.nz/asciidoc/" target="_top">asciidoc</a></p></div><div class="section" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="id2466943"></a>SEE ALSO</h3></div></div></div><p><span class="strong"><strong>module-builder, module-extractor, make-iso, isomorph, mmaker, isomaker, make-mini, install2mainmod, minimod-gen, addtoiso</strong></span></p></div></div><div class="navfooter"><hr><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"><a accesskey="p" href="ar01s04.html">Prev</a> </td><td width="20%" align="center"> </td><td width="40%" align="right"> <a accesskey="n" href="ar01s06.html">Next</a></td></tr><tr><td width="40%" align="left" valign="top">MODULE-EXTRACTOR(1) </td><td width="20%" align="center"><a accesskey="h" href="index.html">Home</a></td><td width="40%" align="right" valign="top"> ISOMORPH(1)</td></tr></table></div></body></html> +</dd></dl></div></div><div class="section" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="id2466886"></a>SECURITY</h3></div></div></div><p>Needs to be run as root or via sudo. So has security implications.</p></div><div class="section" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="id2466897"></a>NOTES</h3></div></div></div><p>Morphix is a modular-based liveCD, designed to be easy to modify. The package morphing-tools and morphix-mmaker contains tools to help modify and build morphix-based LiveCDs.</p></div><div class="section" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="id2466910"></a>BUGS</h3></div></div></div><p>Dont panic. If you find one, report it to us, but please make sure you have read all of the documentation first. We have assumed that you have cloop device and have installed the packages morphing-tools and morphix-mmaker.</p></div><div class="section" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="id2466924"></a>AUTHORS</h3></div></div></div><p>Written by Alex de Landgraaf and other Morphix developers. <a href="http://www.morphix.org/" target="_top">Morphix web site</a>. Browse cvs repository[http://sourceforge.net/projects/morphix] and cvs mailing lists for full list of developers and patches submitted.</p><p>This man page was written by Brendan Sleight using <a href="http://www.methods.co.nz/asciidoc/" target="_top">asciidoc</a></p></div><div class="section" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="id2466954"></a>SEE ALSO</h3></div></div></div><p><span class="strong"><strong>module-builder, module-extractor, make-iso, isomorph, mmaker, isomaker, make-mini, install2mainmod, minimod-gen, addtoiso</strong></span></p></div></div><div class="navfooter"><hr><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"><a accesskey="p" href="ar01s04.html">Prev</a> </td><td width="20%" align="center"> </td><td width="40%" align="right"> <a accesskey="n" href="ar01s06.html">Next</a></td></tr><tr><td width="40%" align="left" valign="top">MODULE-EXTRACTOR(1) </td><td width="20%" align="center"><a accesskey="h" href="index.html">Home</a></td><td width="40%" align="right" valign="top"> ISOMORPH(1)</td></tr></table></div></body></html> Modified: trunk/how_tos/all_man_pages/html/ar01s06.html =================================================================== --- trunk/how_tos/all_man_pages/html/ar01s06.html 2006-03-21 20:06:10 UTC (rev 2150) +++ trunk/how_tos/all_man_pages/html/ar01s06.html 2006-03-21 20:20:18 UTC (rev 2151) @@ -1,4 +1,4 @@ -<html><head><meta http-equiv="Content-Type" content="text/html; charset=ANSI_X3.4-1968"><title>ISOMORPH(1)</title><meta name="generator" content="DocBook XSL Stylesheets V1.68.1"><link rel="start" href="index.html" title="Morphix Man Pages"><link rel="up" href="index.html" title="Morphix Man Pages"><link rel="prev" href="ar01s05.html" title="MAKE-ISO(1)"><link rel="next" href="ar01s07.html" title="MMAKER(1)"><link href="http://www.morphix.org/templates/MorphixORG/css/template_css.css" rel="stylesheet" type="text/css"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">ISOMORPH(1)</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="ar01s05.html">Prev</a> </td><th width="60%" align="center"> </th><td width="20%" align="right"> <a accesskey="n" href="ar01s07.html">Next</a></td></tr></table><hr></div><div class="section" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="id2466960"></a>ISOMORPH(1)</h2></div></div></div><p>Brendan Sleight <morphix@barwap.spam_removed.com></p><div class="section" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="id2466972"></a>NAME</h3></div></div></div><p>isomorph - manipulate a morphix iso</p></div><div class="section" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="id2466982"></a>SYNOPSIS</h3></div></div></div><p><span class="emphasis"><em>isomorph</em></span> —add [OPTIONS…] [ file | file path | option ] OLDISO NEWISO</p><p><span class="emphasis"><em>isomorph</em></span> —del [OPTIONS…] [ file | file path | option ] OLDISO NEWISO</p><p><span class="emphasis"><em>isomorph</em></span> —del-all [OPTIONS…] OLDISO NEWISO</p><p><span class="emphasis"><em>isomorph</em></span> —get [OPTIONS…] ISO DIRECTORY</p><p><span class="emphasis"><em>isomorph</em></span> —list [OPTIONS…] ISO</p><p><span class="emphasis"><em>isomorph</em></span> —list-xml ISO</p></div><div class="section" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="id2467034"></a>DESCRIPTION</h3></div></div></div><p>This script manipulates a morphix iso. Modular parts are added, deleted extracted or listed from the iso.</p></div><div class="section" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="id2467046"></a>OPTIONS</h3></div></div></div><div class="variablelist"><dl><dt><span class="term"> +<html><head><meta http-equiv="Content-Type" content="text/html; charset=ANSI_X3.4-1968"><title>ISOMORPH(1)</title><meta name="generator" content="DocBook XSL Stylesheets V1.68.1"><link rel="start" href="index.html" title="Morphix Man Pages"><link rel="up" href="index.html" title="Morphix Man Pages"><link rel="prev" href="ar01s05.html" title="MAKE-ISO(1)"><link rel="next" href="ar01s07.html" title="MMAKER(1)"><link href="http://www.morphix.org/templates/MorphixORG/css/template_css.css" rel="stylesheet" type="text/css"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">ISOMORPH(1)</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="ar01s05.html">Prev</a> </td><th width="60%" align="center"> </th><td width="20%" align="right"> <a accesskey="n" href="ar01s07.html">Next</a></td></tr></table><hr></div><div class="section" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="id2466970"></a>ISOMORPH(1)</h2></div></div></div><p>Brendan Sleight <morphix@barwap.spam_removed.com></p><div class="section" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="id2466982"></a>NAME</h3></div></div></div><p>isomorph - manipulate a morphix iso</p></div><div class="section" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="id2466993"></a>SYNOPSIS</h3></div></div></div><p><span class="emphasis"><em>isomorph</em></span> —add [OPTIONS…] [ file | file path | option ] OLDISO NEWISO</p><p><span class="emphasis"><em>isomorph</em></span> —del [OPTIONS…] [ file | file path | option ] OLDISO NEWISO</p><p><span class="emphasis"><em>isomorph</em></span> —del-all [OPTIONS…] OLDISO NEWISO</p><p><span class="emphasis"><em>isomorph</em></span> —get [OPTIONS…] ISO DIRECTORY</p><p><span class="emphasis"><em>isomorph</em></span> —list [OPTIONS…] ISO</p><p><span class="emphasis"><em>isomorph</em></span> —list-xml ISO</p></div><div class="section" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="id2467045"></a>DESCRIPTION</h3></div></div></div><p>This script manipulates a morphix iso. Modular parts are added, deleted extracted or listed from the iso.</p></div><div class="section" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="id2467057"></a>OPTIONS</h3></div></div></div><div class="variablelist"><dl><dt><span class="term"> <span class="emphasis"><em>—add</em></span> [OPTIONS…] [ file | file path | option ] OLDISO NEWISO </span></dt><dd><p> Add modular parts to the <span class="emphasis"><em>OLDISO</em></span> making a <span class="emphasis"><em>NEWISO</em></span> @@ -146,8 +146,8 @@ <span class="emphasis"><em>—list-xml</em></span> ISO </span></dt><dd> List all morphix files in XML format from the <span class="emphasis"><em>ISO</em></span> -</dd></dl></div></div><div class="section" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="id2514371"></a>EXAMPLES</h3></div></div></div><div class="variablelist"><dl><dt><span class="term"> +</dd></dl></div></div><div class="section" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="id2514382"></a>EXAMPLES</h3></div></div></div><div class="variablelist"><dl><dt><span class="term"> Add a boot parameter to a Morphix iso </span></dt><dd> isomorph —add boot "splash=n" /tmp/old.iso /tmp/new.iso -</dd></dl></div></div><div class="section" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="id2514398"></a>SECURITY</h3></div></div></div><p>Needs to be run as root or via sudo. So has security implications.</p></div><div class="section" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="id2514409"></a>NOTES</h3></div></div></div><p>Morphix is a modular-based liveCD, designed to be easy to modify. The package morphing-tools and morphix-mmaker contains tools to help modify and build morphix-based LiveCDs.</p></div><div class="section" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="id2514422"></a>BUGS</h3></div></div></div><p>Dont panic. If you find one, report it to us, but please make sure you have read all of the documentation first. We have assumed that you have cloop device and have installed the packages morphing-tools and morphix-mmaker.</p></div><div class="section" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="id2514436"></a>AUTHORS</h3></div></div></div><p>Written by Alex de Landgraaf and other Morphix developers. <a href="http://www.morphix.org/" target="_top">Morphix web site</a>. Browse cvs repository[http://sourceforge.net/projects/morphix] and cvs mailing lists for full list of developers and patches submitted.</p><p>This man page was written by Brendan Sleight using <a href="http://www.methods.co.nz/asciidoc/" target="_top">asciidoc</a></p></div><div class="section" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="id2514466"></a>SEE ALSO</h3></div></div></div><p><span class="strong"><strong>module-builder, module-extractor, make-iso, isomorph, mmaker, isomaker, make-mini, install2mainmod, minimod-gen, addtoiso</strong></span></p></div></div><div class="navfooter"><hr><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"><a accesskey="p" href="ar01s05.html">Prev</a> </td><td width="20%" align="center"> </td><td width="40%" align="right"> <a accesskey="n" href="ar01s07.html">Next</a></td></tr><tr><td width="40%" align="left" valign="top">MAKE-ISO(1) </td><td width="20%" align="center"><a accesskey="h" href="index.html">Home</a></td><td width="40%" align="right" valign="top"> MMAKER(1)</td></tr></table></div></body></html> +</dd></dl></div></div><div class="section" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="id2514409"></a>SECURITY</h3></div></div></div><p>Needs to be run as root or via sudo. So has security implications.</p></div><div class="section" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="id2514420"></a>NOTES</h3></div></div></div><p>Morphix is a modular-based liveCD, designed to be easy to modify. The package morphing-tools and morphix-mmaker contains tools to help modify and build morphix-based LiveCDs.</p></div><div class="section" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="id2514433"></a>BUGS</h3></div></div></div><p>Dont panic. If you find one, report it to us, but please make sure you have read all of the documentation first. We have assumed that you have cloop device and have installed the packages morphing-tools and morphix-mmaker.</p></div><div class="section" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="id2514447"></a>AUTHORS</h3></div></div></div><p>Written by Alex de Landgraaf and other Morphix developers. <a href="http://www.morphix.org/" target="_top">Morphix web site</a>. Browse cvs repository[http://sourceforge.net/projects/morphix] and cvs mailing lists for full list of developers and patches submitted.</p><p>This man page was written by Brendan Sleight using <a href="http://www.methods.co.nz/asciidoc/" target="_top">asciidoc</a></p></div><div class="section" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="id2514476"></a>SEE ALSO</h3></div></div></div><p><span class="strong"><strong>module-builder, module-extractor, make-iso, isomorph, mmaker, isomaker, make-mini, install2mainmod, minimod-gen, addtoiso</strong></span></p></div></div><div class="navfooter"><hr><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"><a accesskey="p" href="ar01s05.html">Prev</a> </td><td width="20%" align="center"> </td><td width="40%" align="right"> <a accesskey="n" href="ar01s07.html">Next</a></td></tr><tr><td width="40%" align="left" valign="top">MAKE-ISO(1) </td><td width="20%" align="center"><a accesskey="h" href="index.html">Home</a></td><td width="40%" align="right" valign="top"> MMAKER(1)</td></tr></table></div></body></html> Modified: trunk/how_tos/all_man_pages/html/ar01s07.html =================================================================== --- trunk/how_tos/all_man_pages/html/ar01s07.html 2006-03-21 20:06:10 UTC (rev 2150) +++ trunk/how_tos/all_man_pages/html/ar01s07.html 2006-03-21 20:20:18 UTC (rev 2151) @@ -1,4 +1,4 @@ -<html><head><meta http-equiv="Content-Type" content="text/html; charset=ANSI_X3.4-1968"><title>MMAKER(1)</title><meta name="generator" content="DocBook XSL Stylesheets V1.68.1"><link rel="start" href="index.html" title="Morphix Man Pages"><link rel="up" href="index.html" title="Morphix Man Pages"><link rel="prev" href="ar01s06.html" title="ISOMORPH(1)"><link rel="next" href="ar01s08.html" title="ISOMAKER(1)"><link href="http://www.morphix.org/templates/MorphixORG/css/template_css.css" rel="stylesheet" type="text/css"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">MMAKER(1)</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="ar01s06.html">Prev</a> </td><th width="60%" align="center"> </th><td width="20%" align="right"> <a accesskey="n" href="ar01s08.html">Next</a></td></tr></table><hr></div><div class="section" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="id2514482"></a>MMAKER(1)</h2></div></div></div><p>Brendan Sleight <morphix@barwap.spam_removed.com></p><div class="section" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="id2514494"></a>NAME</h3></div></div></div><p>mmaker - Creates a morphix base or morphix main module, using template files</p></div><div class="section" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="id2514505"></a>SYNOPSIS</h3></div></div></div><p><span class="emphasis"><em>mmaker</em></span> [-g debootstrap.tar.gz] [-b debootstrap.tar.bz] [-m miniroot.gz] [-k vmlinuz-mykernel] [-t /tempdir] [-c] [-d /debootstrapped] [-p http://proxy.mydomain.com:8080] [-v] [-i] input.xml output.mod</p></div><div class="section" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="id2514521"></a>DESCRIPTION</h3></div></div></div><p>Mmaker creates a Morphix base or main module <span class="emphasis"><em>output.mod</em></span>, using a xml template file <span class="emphasis"><em>input.xml</em></span>. A really lazy way to build parts of a LiveCD.</p></div><div class="section" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="id2514541"></a>OPTIONS</h3></div></div></div><div class="variablelist"><dl><dt><span class="term"> +<html><head><meta http-equiv="Content-Type" content="text/html; charset=ANSI_X3.4-1968"><title>MMAKER(1)</title><meta name="generator" content="DocBook XSL Stylesheets V1.68.1"><link rel="start" href="index.html" title="Morphix Man Pages"><link rel="up" href="index.html" title="Morphix Man Pages"><link rel="prev" href="ar01s06.html" title="ISOMORPH(1)"><link rel="next" href="ar01s08.html" title="ISOMAKER(1)"><link href="http://www.morphix.org/templates/MorphixORG/css/template_css.css" rel="stylesheet" type="text/css"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">MMAKER(1)</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="ar01s06.html">Prev</a> </td><th width="60%" align="center"> </th><td width="20%" align="right"> <a accesskey="n" href="ar01s08.html">Next</a></td></tr></table><hr></div><div class="section" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="id2514493"></a>MMAKER(1)</h2></div></div></div><p>Brendan Sleight <morphix@barwap.spam_removed.com></p><div class="section" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="id2514505"></a>NAME</h3></div></div></div><p>mmaker - Creates a morphix base or morphix main module, using template files</p></div><div class="section" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="id2514516"></a>SYNOPSIS</h3></div></div></div><p><span class="emphasis"><em>mmaker</em></span> [-g debootstrap.tar.gz] [-b debootstrap.tar.bz] [-m miniroot.gz] [-k vmlinuz-mykernel] [-t /tempdir] [-c] [-d /debootstrapped] [-p http://proxy.mydomain.com:8080] [-v] [-i] input.xml output.mod</p></div><div class="section" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="id2514532"></a>DESCRIPTION</h3></div></div></div><p>Mmaker creates a Morphix base or main module <span class="emphasis"><em>output.mod</em></span>, using a xml template file <span class="emphasis"><em>input.xml</em></span>. A really lazy way to build parts of a LiveCD.</p></div><div class="section" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="id2514552"></a>OPTIONS</h3></div></div></div><div class="variablelist"><dl><dt><span class="term"> <span class="emphasis"><em>-g debootstrap.tar.gz</em></span> </span></dt><dd> Use a local debian bootstrap, rather than download from repository. @@ -38,7 +38,7 @@ <span class="emphasis"><em>-i</em></span> </span></dt><dd> Interactive mode - may not work. -</dd></dl></div></div><div class="section" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="id2514738"></a>EXAMPLES</h3></div></div></div><div class="variablelist"><dl><dt><span class="term"> +</dd></dl></div></div><div class="section" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="id2514749"></a>EXAMPLES</h3></div></div></div><div class="variablelist"><dl><dt><span class="term"> Build a Morphix base module </span></dt><dd> mmaker -m /my/livecd/boot/miniroot.gz -k /my/livecd/boot/vmlinuz basemod.xml /my/livecd/base/morphix @@ -46,4 +46,4 @@ Build a Morphix main module </span></dt><dd> mmaker firefox.xml firefox.mod -</dd></dl></div></div><div class="section" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="id2514781"></a>SECURITY</h3></div></div></div><p>Needs to be run as root or via sudo. So has security implications.</p></div><div class="section" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="id2514792"></a>NOTES</h3></div></div></div><p>Morphix is a modular-based liveCD, designed to be easy to modify. The package morphing-tools and morphix-mmaker contains tools to help modify and build morphix-based LiveCDs.</p></div><div class="section" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="id2514806"></a>BUGS</h3></div></div></div><p>Dont panic. If you find one, report it to us, but please make sure you have read all of the documentation first. We have assumed that you have cloop device and have installed the packages morphing-tools and morphix-mmaker.</p></div><div class="section" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="id2514820"></a>AUTHORS</h3></div></div></div><p>Written by Alex de Landgraaf and other Morphix developers. <a href="http://www.morphix.org/" target="_top">Morphix web site</a>. Browse cvs repository[http://sourceforge.net/projects/morphix] and cvs mailing lists for full list of developers and patches submitted.</p><p>This man page was written by Brendan Sleight using <a href="http://www.methods.co.nz/asciidoc/" target="_top">asciidoc</a></p></div><div class="section" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="id2514849"></a>SEE ALSO</h3></div></div></div><p><span class="strong"><strong>module-builder, module-extractor, make-iso, isomorph, mmaker, isomaker, make-mini, install2mainmod, minimod-gen, addtoiso</strong></span></p></div></div><div class="navfooter"><hr><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"><a accesskey="p" href="ar01s06.html">Prev</a> </td><td width="20%" align="center"> </td><td width="40%" align="right"> <a accesskey="n" href="ar01s08.html">Next</a></td></tr><tr><td width="40%" align="left" valign="top">ISOMORPH(1) </td><td width="20%" align="center"><a accesskey="h" href="index.html">Home</a></td><td width="40%" align="right" valign="top"> ISOMAKER(1)</td></tr></table></div></body></html> +</dd></dl></div></div><div class="section" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="id2514792"></a>SECURITY</h3></div></div></div><p>Needs to be run as root or via sudo. So has security implications.</p></div><div class="section" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="id2514803"></a>NOTES</h3></div></div></div><p>Morphix is a modular-based liveCD, designed to be easy to modify. The package morphing-tools and morphix-mmaker contains tools to help modify and build morphix-based LiveCDs.</p></div><div class="section" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="id2514816"></a>BUGS</h3></div></div></div><p>Dont panic. If you find one, report it to us, but please make sure you have read all of the documentation first. We have assumed that you have cloop device and have installed the packages morphing-tools and morphix-mmaker.</p></div><div class="section" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="id2514830"></a>AUTHORS</h3></div></div></div><p>Written by Alex de Landgraaf and other Morphix developers. <a href="http://www.morphix.org/" target="_top">Morphix web site</a>. Browse cvs repository[http://sourceforge.net/projects/morphix] and cvs mailing lists for full list of developers and patches submitted.</p><p>This man page was written by Brendan Sleight using <a href="http://www.methods.co.nz/asciidoc/" target="_top">asciidoc</a></p></div><div class="section" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="id2514860"></a>SEE ALSO</h3></div></div></div><p><span class="strong"><strong>module-builder, module-extractor, make-iso, isomorph, mmaker, isomaker, make-mini, install2mainmod, minimod-gen, addtoiso</strong></span></p></div></div><div class="navfooter"><hr><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"><a accesskey="p" href="ar01s06.html">Prev</a> </td><td width="20%" align="center"> </td><td width="40%" align="right"> <a accesskey="n" href="ar01s08.html">Next</a></td></tr><tr><td width="40%" align="left" valign="top">ISOMORPH(1) </td><td width="20%" align="center"><a accesskey="h" href="index.html">Home</a></td><td width="40%" align="right" valign="top"> ISOMAKER(1)</td></tr></table></div></body></html> Modified: trunk/how_tos/all_man_pages/html/ar01s08.html =================================================================== --- trunk/how_tos... [truncated message content] |
|
From: <ale...@us...> - 2006-05-30 22:08:26
|
Revision: 2282 Author: alextreme Date: 2006-05-30 15:08:18 -0700 (Tue, 30 May 2006) ViewCVS: http://svn.sourceforge.net/morphix/?rev=2282&view=rev Log Message: ----------- * adding <commandlist><command></command></commandlist> tags * Brendan, could you give this a spin? Will package after you OK it :) Modified Paths: -------------- trunk/mmaker/README trunk/mmaker/README.isomaker trunk/mmaker/README.template trunk/mmaker/libmorphix/makemodule.c trunk/mmaker/libmorphix/parsemod.c trunk/mmaker/libmorphix/parsemod.h Modified: trunk/mmaker/README =================================================================== --- trunk/mmaker/README 2006-05-30 21:51:21 UTC (rev 2281) +++ trunk/mmaker/README 2006-05-30 22:08:18 UTC (rev 2282) @@ -35,7 +35,7 @@ How does it handle initialization of a module at runtime? --------------------------------------------------------- -The /morphix/init* scripts too are in the process of being debianified, light and gnome already are there. +The /morphix/init* scripts too are in the process of being debianified. Add one of the morphix-init-* packages, they are available for most windowmanagers. Files in morphix-init contain the basics, should be easy to fork & customize. How do I make/install mmaker? ----------------------------- Modified: trunk/mmaker/README.isomaker =================================================================== --- trunk/mmaker/README.isomaker 2006-05-30 21:51:21 UTC (rev 2281) +++ trunk/mmaker/README.isomaker 2006-05-30 22:08:18 UTC (rev 2282) @@ -10,6 +10,7 @@ morphix-mmaker morphix-make-iso morphix-deb-get +morphix-morphmini Usage: ------ @@ -18,6 +19,7 @@ -b: Base module template to build output.iso with -m: Main module template to include in output.iso + -n: Mini module template to include in output.iso (needs morphmini) -r: Specify repository for deb/udeb packages to include on iso -p: Packages to be included on iso -t: Tarball to be included on iso Modified: trunk/mmaker/README.template =================================================================== --- trunk/mmaker/README.template 2006-05-30 21:51:21 UTC (rev 2281) +++ trunk/mmaker/README.template 2006-05-30 22:08:18 UTC (rev 2282) @@ -61,10 +61,18 @@ <!-- package to apt-get purge --> ... </packagelist> + <patchlist> <patch>path/to/shellscript.sh</patch> ( <!-- shell script on HOST system, gets the build directory as $1 --> </patchlist> + + <commandlist> + + <command>echo "Real Morphers idle on #morphix"</command> ( + <!-- shell command run in the build chroot, just before compressing --> + </commandlist> + </group> </comps> Modified: trunk/mmaker/libmorphix/makemodule.c =================================================================== --- trunk/mmaker/libmorphix/makemodule.c 2006-05-30 21:51:21 UTC (rev 2281) +++ trunk/mmaker/libmorphix/makemodule.c 2006-05-30 22:08:18 UTC (rev 2282) @@ -528,6 +528,37 @@ } /** + Executes shell commands, defined in the xml file. + + @param module mmodule*; module structure, initialised + @param dirname gchar*; location of the directory + + return TRUE if successful, FALSE and message to stderr if an error occurred +*/ + +gboolean executeCommands(mmodule *module, gchar *dirname) { + GList *ptr = module->commandlist; + while (ptr != NULL) { + gchar *cmdline = NULL; + gchar *command = ptr->data; + + if (command == NULL) + continue; + + cmdline = g_strdup_printf("%s %s %s",P_CHROOT,module->dirname,command); + if (!ExecuteCommand(cmdline)) { + fprintf(stderr,"Warning: unable to execute command: %s\n", command); + g_free(command); + g_free(cmdline); + continue; + } + g_free(cmdline); + ptr = ptr->next; + } + return TRUE; +} + +/** Reverts debconf to normal usage @param dirname gchar*; location of the module @@ -1088,6 +1119,9 @@ if (!executePatches(module,module->dirname)) { return FALSE; } + if (!executeCommands(module,module->dirname)) { + return FALSE; + } if (!compressModule(module,outputfilename,leave_dir,FS_ISO9660,module->name)) { return FALSE; @@ -1116,6 +1150,9 @@ if (!executePatches(module,module->dirname)) { return FALSE; } + if (!executeCommands(module,module->dirname)) { + return FALSE; + } if (!compressModule(module,outputfilename,leave_dir,FS_ISO9660,module->name)) { return FALSE; Modified: trunk/mmaker/libmorphix/parsemod.c =================================================================== --- trunk/mmaker/libmorphix/parsemod.c 2006-05-30 21:51:21 UTC (rev 2281) +++ trunk/mmaker/libmorphix/parsemod.c 2006-05-30 22:08:18 UTC (rev 2282) @@ -236,6 +236,21 @@ return module; } +mmodule* parseCommandlist(xmlDocPtr doc, xmlNodePtr cur, mmodule *module) { + xmlChar *key; + cur = cur->xmlChildrenNode; + module->commandlist = NULL; + while (cur != NULL) { + if (!xmlStrcmp(cur->name, ((const xmlChar *)"command"))) { + key = xmlNodeListGetString(doc, cur->xmlChildrenNode, 1); + module->commandlist = g_list_append(module->commandlist,g_strdup(key)); + xmlFree(key); + } + cur = cur->next; + } + return module; +} + void initPackage(package_struct *package) { package->name = NULL; package->target = NULL; @@ -254,6 +269,7 @@ module->packagelist = NULL; module->packagedeletelist = NULL; module->patchlist = NULL; + module->commandlist = NULL; module->arch = NULL; module->verbose = FALSE; module->interactive = FALSE; @@ -312,6 +328,9 @@ if (!xmlStrcmp(cur->name, ((const xmlChar *)"patchlist"))) { parsePatchlist(doc,cur,module); } + if (!xmlStrcmp(cur->name, ((const xmlChar *)"commandlist"))) { + parseCommandlist(doc,cur,module); + } cur = cur->next; } return module; @@ -391,6 +410,14 @@ } g_list_free(module->patchlist); } + if (module->commandlist != NULL) { + GList *ptr = module->commandlist; + while (ptr != NULL) { + g_free(ptr->data); + ptr = ptr->next; + } + g_list_free(module->commandlist); + } g_free(module); } Modified: trunk/mmaker/libmorphix/parsemod.h =================================================================== --- trunk/mmaker/libmorphix/parsemod.h 2006-05-30 21:51:21 UTC (rev 2281) +++ trunk/mmaker/libmorphix/parsemod.h 2006-05-30 22:08:18 UTC (rev 2282) @@ -48,6 +48,7 @@ GList *packagelist; // list of package structs GList *packagedeletelist; // list of package structs GList *patchlist; // list of names of patches for module + GList *commandlist; // list of commands for module GList *retrievelist; // list of to/from combinations gboolean verbose; // build verbosely This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <ale...@us...> - 2006-07-13 14:03:54
|
Revision: 2357 Author: alextreme Date: 2006-07-13 07:03:43 -0700 (Thu, 13 Jul 2006) ViewCVS: http://svn.sourceforge.net/morphix/?rev=2357&view=rev Log Message: ----------- * adding experimental localdeb-tag, as yet untested... Modified Paths: -------------- trunk/mmaker/README.template trunk/mmaker/libmorphix/makemodule.c trunk/mmaker/libmorphix/parsemod.c trunk/mmaker/libmorphix/parsemod.h Modified: trunk/mmaker/README.template =================================================================== --- trunk/mmaker/README.template 2006-07-13 13:36:12 UTC (rev 2356) +++ trunk/mmaker/README.template 2006-07-13 14:03:43 UTC (rev 2357) @@ -17,7 +17,7 @@ <description>possibly multiline description of module</description> - <type>[mainmod|basemod|minimod]</type> ( + <type>[mainmod|basemod|minimod]</type> <!-- currently only main/basemod are useful --> <suite>[sid|sarge|woody|unstable|testing|stable]</suite> @@ -62,15 +62,21 @@ ... </packagelist> + <localdeblist> + + <localdeb>/path/to/package.deb</localdeb> + <!-- this package from the host system is copied into the build directory and installed using dpkg -i. It is removed afterwards --> + </localdeblist> + <patchlist> - <patch>path/to/shellscript.sh</patch> ( - <!-- shell script on host system, gets copied into the root of the build directory and is executed --> + <patch>path/to/shellscript.sh</patch> + <!-- shell script on host system, gets copied into the root of the build directory and is executed. It is removed afterwards --> </patchlist> <commandlist> - <command>echo "Real Morphers idle on #morphix"</command> ( + <command>echo "Real Morphers idle on #morphix"</command> <!-- shell command run in the build chroot, just before compressing --> </commandlist> Modified: trunk/mmaker/libmorphix/makemodule.c =================================================================== --- trunk/mmaker/libmorphix/makemodule.c 2006-07-13 13:36:12 UTC (rev 2356) +++ trunk/mmaker/libmorphix/makemodule.c 2006-07-13 14:03:43 UTC (rev 2357) @@ -565,15 +565,59 @@ } /** + Copies one or more packages from the host system and installs these + using dpkg -i (ie. no dependancies are resolved!) + + @param module mmodule*; module structure, initialised + + return TRUE if successful, FALSE and message to stderr if an error occurred +*/ + +gboolean installLocalPackages(mmodule *module) { + GList *ptr = module->localdeblist; + while (ptr != NULL) { + gchar *cmdline = NULL; + gchar *basename = g_path_get_basename(ptr->data); + + if (basename == NULL) + continue; + + cmdline = g_strdup_printf("cp %s %s/%s",ptr->data,module->dirname,basename); + if (!ExecuteCommand(cmdline)) { + fprintf(stderr,"Warning: unable to copy package into build directory\n"); + g_free(basename); + g_free(cmdline); + continue; + } + g_free(cmdline); + + cmdline = g_strdup_printf("%s %s dpkg -i /%s",P_CHROOT,module->dirname,basename); + if (!ExecuteCommand(cmdline)) { + fprintf(stderr,"Warning: unable to install local package: %s\n",ptr->data); + } + g_free(cmdline); + + + cmdline = g_strdup_printf("%s %s rm /%s",P_CHROOT,module->dirname,basename); + if (!ExecuteCommand(cmdline)) { + fprintf(stderr,"Warning: unable to remove local package after installation: %s\n",ptr->data); + } + + g_free(cmdline); + g_free(basename); + ptr = ptr->next; + } + return TRUE; +} + +/** Executes shell scripts, defined in the xml file. - Gives the location of the uncompressed module as the script's first argument + For security reasons, the script is executed in the chroot + (it is copied into the root of the build directory before execution) @param module mmodule*; module structure, initialised @param dirname gchar*; location of the directory - this needs fixing, as executing stuff as root from a file is evil... - Gandalfar will slap me for this - return TRUE if successful, FALSE and message to stderr if an error occurred */ @@ -600,6 +644,12 @@ fprintf(stderr,"Warning: unable to execute patch: %s\n",ptr->data); } g_free(cmdline); + + cmdline = g_strdup_printf("%s %s rm /%s",P_CHROOT,module->dirname,basename); + if (!ExecuteCommand(cmdline)) { + fprintf(stderr,"Warning: unable to remove patch script after executing it: %s\n",ptr->data); + } + g_free(cmdline); g_free(basename); ptr = ptr->next; } @@ -1211,6 +1261,9 @@ if (!addPackagesMainModule(module, extra_package_list)) { return FALSE; } + if (!installLocalPackages(module)) { + return FALSE; + } if (!executeRetrieveFiles(module)) { return FALSE; } @@ -1237,6 +1290,9 @@ if (!addPackagesBaseModule(module, extra_package_list)) { return FALSE; } + if (!installLocalPackages(module)) { + return FALSE; + } if (!moveMorphixEtcFiles(module)) { return FALSE; } Modified: trunk/mmaker/libmorphix/parsemod.c =================================================================== --- trunk/mmaker/libmorphix/parsemod.c 2006-07-13 13:36:12 UTC (rev 2356) +++ trunk/mmaker/libmorphix/parsemod.c 2006-07-13 14:03:43 UTC (rev 2357) @@ -236,6 +236,21 @@ return module; } +mmodule* parseLocalDeblist(xmlDocPtr doc, xmlNodePtr cur, mmodule *module) { + xmlChar *key; + cur = cur->xmlChildrenNode; + module->localdeblist = NULL; + while (cur != NULL) { + if (!xmlStrcmp(cur->name, ((const xmlChar *)"localdeb"))) { + key = xmlNodeListGetString(doc, cur->xmlChildrenNode, 1); + module->localdeblist = g_list_append(module->localdeblist,g_strdup(key)); + xmlFree(key); + } + cur = cur->next; + } + return module; +} + mmodule* parseCommandlist(xmlDocPtr doc, xmlNodePtr cur, mmodule *module) { xmlChar *key; cur = cur->xmlChildrenNode; @@ -328,6 +343,9 @@ if (!xmlStrcmp(cur->name, ((const xmlChar *)"patchlist"))) { parsePatchlist(doc,cur,module); } + if (!xmlStrcmp(cur->name, ((const xmlChar *)"localdeblist"))) { + parseCommandlist(doc,cur,module); + } if (!xmlStrcmp(cur->name, ((const xmlChar *)"commandlist"))) { parseCommandlist(doc,cur,module); } @@ -418,6 +436,14 @@ } g_list_free(module->commandlist); } + if (module->localdeblist != NULL) { + GList *ptr = module->localdeblist; + while (ptr != NULL) { + g_free(ptr->data); + ptr = ptr->next; + } + g_list_free(module->localdeblist); + } g_free(module); } Modified: trunk/mmaker/libmorphix/parsemod.h =================================================================== --- trunk/mmaker/libmorphix/parsemod.h 2006-07-13 13:36:12 UTC (rev 2356) +++ trunk/mmaker/libmorphix/parsemod.h 2006-07-13 14:03:43 UTC (rev 2357) @@ -49,6 +49,7 @@ GList *packagedeletelist; // list of package structs GList *patchlist; // list of names of patches for module GList *commandlist; // list of commands for module + GList *localdeblist; // list of locations of packages on host GList *retrievelist; // list of to/from combinations gboolean verbose; // build verbosely This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <ale...@us...> - 2006-09-23 16:14:55
|
Revision: 2420
http://svn.sourceforge.net/morphix/?rev=2420&view=rev
Author: alextreme
Date: 2006-09-23 09:14:39 -0700 (Sat, 23 Sep 2006)
Log Message:
-----------
* bumping
* fixed make-mini (now uses --homedir USER, --homedir-all USER and
--homedir-hidden USER)
Modified Paths:
--------------
trunk/mmaker/debian/changelog
trunk/mmaker/libmorphix/makemini.c
trunk/mmaker/libmorphix/makemini.h
trunk/mmaker/src/make-mini.c
Modified: trunk/mmaker/debian/changelog
===================================================================
--- trunk/mmaker/debian/changelog 2006-09-20 23:12:59 UTC (rev 2419)
+++ trunk/mmaker/debian/changelog 2006-09-23 16:14:39 UTC (rev 2420)
@@ -1,3 +1,15 @@
+morphix-mmaker (0.4-37) unstable; urgency=low
+
+ * fixed make-mini (manual needs updating though...)
+
+ -- root <ro...@al...> Sat, 23 Sep 2006 18:12:15 +0200
+
+morphix-mmaker (0.4-36) unstable; urgency=low
+
+ * bumping to avoid version conflicts...
+
+ -- root <ro...@al...> Mon, 4 Sep 2006 00:25:58 +0200
+
morphix-mmaker (0.4-34) unstable; urgency=low
* adding -s sources.tar.gz option for mmaker, for automatically retrieving all source packages for a module
Modified: trunk/mmaker/libmorphix/makemini.c
===================================================================
--- trunk/mmaker/libmorphix/makemini.c 2006-09-20 23:12:59 UTC (rev 2419)
+++ trunk/mmaker/libmorphix/makemini.c 2006-09-23 16:14:39 UTC (rev 2420)
@@ -35,8 +35,8 @@
TODO: parse /morphix/include.sh, if exists, and use /home/$USER instead...
*/
-#define HOME_MORPH_FILES_HID "~/.*"
-#define HOME_MORPH_FILES_NOT_HID "~/*"
+#define HOME_MORPH_FILES_HID ".*"
+#define HOME_MORPH_FILES_NOT_HID "*"
void writeLoadmodHeader(FILE *file) {
fprintf(file,"#!/bin/sh \n");
@@ -143,7 +143,7 @@
g_free(cmdline);
}
-gboolean makeHomedirMini(mmodule *module, gchar *output, gboolean save_homedir, gboolean save_overlay, gboolean save_hidden_homedir)
+gboolean makeHomedirMini(mmodule *module, gchar *output, gboolean save_homedir, gboolean save_overlay, gboolean save_hidden_homedir, gchar *user)
{
gchar *cmdline;
gchar *temp_string;
@@ -158,6 +158,9 @@
gboolean update = FALSE; // should add another argument for this one
FILE *file;
+ if (user == NULL) {
+ return FALSE;
+ }
// # Set up tmp-dir needed
cmdline = g_strdup_printf("mkdir -p %s/files",module->dirname);
@@ -230,7 +233,7 @@
// exclude Xauthority and ICEauthority from hidden saves, this slows X's boot time
// we exclude .xinitrc as well, as it would make most morph's barf (.xinitrc gets added too)
- cmdline = g_strdup_printf("sh -c 'sudo tar --exclude=\'.xinitrc\' --exclude=\'.Xauthority\' --exclude=\'.ICEauthority\' --exclude=\'.\' --exclude=\'..\' -zcvf %s %s --gzip --wildcards --one-file-system --same-permissions --recursion %s --show-omitted-dirs --totals 2>/dev/null'",tar_names,HOME_MORPH_FILES_HID, date_label);
+ cmdline = g_strdup_printf("sh -c 'sudo tar --exclude=\'.xinitrc\' --exclude=\'.Xauthority\' --exclude=\'.ICEauthority\' --exclude=\'.\' --exclude=\'..\' -zcvf %s /home/%s/%s --gzip --wildcards --one-file-system --same-permissions --recursion %s --show-omitted-dirs --totals 2>/dev/null'",tar_names,user,HOME_MORPH_FILES_HID, date_label);
ExecuteCommand(cmdline);
g_free(cmdline);
g_free(tar_names);
@@ -240,7 +243,7 @@
{
tar_names = g_strdup_printf("%s/files/files%d.tar.gz",module->dirname,count_files);
//Testing removed sudo
- cmdline = g_strdup_printf("sh -c 'sudo tar --exclude=\'.\' --exclude=\'..\' -zcvf %s %s --gzip --wildcards --one-file-system --same-permissions --recursion %s --show-omitted-dirs --totals 2>/dev/null'",tar_names,HOME_MORPH_FILES_NOT_HID, date_label);
+ cmdline = g_strdup_printf("sh -c 'sudo tar --exclude=\'.\' --exclude=\'..\' -zcvf %s /home/%s/%s --gzip --wildcards --one-file-system --same-permissions --recursion %s --show-omitted-dirs --totals 2>/dev/null'",tar_names,user,HOME_MORPH_FILES_NOT_HID, date_label);
ExecuteCommand(cmdline);
g_free(cmdline);
g_free(tar_names);
Modified: trunk/mmaker/libmorphix/makemini.h
===================================================================
--- trunk/mmaker/libmorphix/makemini.h 2006-09-20 23:12:59 UTC (rev 2419)
+++ trunk/mmaker/libmorphix/makemini.h 2006-09-23 16:14:39 UTC (rev 2420)
@@ -3,6 +3,6 @@
#include <glib.h>
gboolean makeLanguageMini(mmodule *module, gchar *output, gchar *lang);
-gboolean makeHomedirMini(mmodule *module, gchar *output, gboolean save_homedir, gboolean save_overlay, gboolean save_hidden_homedir);
+gboolean makeHomedirMini(mmodule *module, gchar *output, gboolean save_homedir, gboolean save_overlay, gboolean save_hidden_homedir, gchar *user);
#endif
Modified: trunk/mmaker/src/make-mini.c
===================================================================
--- trunk/mmaker/src/make-mini.c 2006-09-20 23:12:59 UTC (rev 2419)
+++ trunk/mmaker/src/make-mini.c 2006-09-23 16:14:39 UTC (rev 2420)
@@ -29,15 +29,17 @@
#include "../libmorphix/makemini.h"
void usage(gchar *filename) {
- printf("Usage: %s [--overlay | --hidden | --homedir] output.mod\n\n",filename);
+ printf("Usage: %s [--overlay | --homedir-all USER | --homedir-hidden USER | --homedir USER ] output.mod\n\n",filename);
printf("Currently only support for homedir/overlay modules is implemented\n\n");
printf("Use one of:\n");
printf("\t--lang LANG:\tuse LANG as the default language (overridden by bootoptions)\n");
- printf("\t\tLANG example: nl_NL@euro\n");
- printf("\t--overlay:\tuse files from /tmp/overlay\n");
- printf("\t--hidden:\tuse hidden users files\n");
- printf("\t--homedir:\tuse normal users files\n");
+ printf("\t--overlay:\tadd files from /tmp/overlay to minimodule\n");
+ printf("\t--homedir-hidden USER:\tadd hidden USER's files to minimodule\n");
+ printf("\t--homedir USER:\t\tadd non-hidden USER's files to minimodule\n");
+ printf("\t--homedir-all USER:\tadd both hidden and non-hidden USER's files to minimodule\n\n");
+ printf("\tLANG example: nl_NL@euro\n");
+ printf("\tUSER must be a valid user and have a /home/USER directory, ie: morph\n");
printf("\nThis tool is made possible by an infinite amount of monkeys\n");
}
@@ -45,6 +47,7 @@
mmodule *module;
gchar *cmdline = NULL;
gchar *lang = NULL;
+ gchar *user = NULL;
gboolean overlay = FALSE;
gboolean hidden = FALSE;
gboolean homedir = FALSE;
@@ -57,9 +60,10 @@
static struct option long_options[] = {
{"overlay",0,0,0},
- {"hidden",0,0,1},
- {"homedir",0,0,2},
+ {"homedir-hidden",1,0,1},
+ {"homedir",1,0,2},
{"lang",1,0,3}, // requires LANG argument
+ {"homedir-all",1,0,4},
{0,0,0,0}
};
@@ -76,23 +80,37 @@
d=c;
break;
- case 1: //homedir (hidden files only)
- opts+=1;
+ case 1: //homedir-hidden (hidden files only)
+ opts+=2;
hidden = TRUE;
+ homedir = FALSE;
+ user = g_strdup(optarg);
d=c;
break;
case 2: //homedir
- opts+=1;
+ opts+=2;
homedir = TRUE;
+ hidden = FALSE;
+ user = g_strdup(optarg);
d=c;
break;
+
case 3: // lang
opts+=2;
langoption = TRUE;
lang = g_strdup(optarg);
d=c;
break;
+
+ case 4: //homedir-all
+ opts+=2;
+ homedir = TRUE;
+ hidden = TRUE;
+ user = g_strdup(optarg);
+ d=c;
+ break;
+
case '?':
printf("Unknown command line option...\n");
usage(argv[0]);
@@ -125,8 +143,8 @@
}
printf("Info: building module\n");
- if (d < 3) {
- success = makeHomedirMini(module,argv[1+opts],homedir,overlay,hidden);
+ if (d < 3 || d == 4) {
+ success = makeHomedirMini(module,argv[1+opts],homedir,overlay,hidden,user);
}
else if (langoption == TRUE) {
success = makeLanguageMini(module,argv[1+opts],lang);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bms...@us...> - 2007-04-05 19:45:14
|
Revision: 2471
http://svn.sourceforge.net/morphix/?rev=2471&view=rev
Author: bmsleight
Date: 2007-04-05 12:45:09 -0700 (Thu, 05 Apr 2007)
Log Message:
-----------
Fix for bug #1695227 - retrieve wget -P not wget -O
Modified Paths:
--------------
trunk/mmaker/debian/changelog
trunk/mmaker/libmorphix/makemodule.c
trunk/mmaker/utils/local_autobuilds.sh
Modified: trunk/mmaker/debian/changelog
===================================================================
--- trunk/mmaker/debian/changelog 2007-04-03 22:05:51 UTC (rev 2470)
+++ trunk/mmaker/debian/changelog 2007-04-05 19:45:09 UTC (rev 2471)
@@ -1,3 +1,9 @@
+morphix-mmaker (0.4-38) unstable; urgency=low
+
+ * Fix for remote retrieve of files
+
+ -- bmsleight <bms...@ba...> Thu, 05 Apr 2007 21:00:00 +0100
+
morphix-mmaker (0.4-37) unstable; urgency=low
* fixed make-mini (manual needs updating though...)
Modified: trunk/mmaker/libmorphix/makemodule.c
===================================================================
--- trunk/mmaker/libmorphix/makemodule.c 2007-04-03 22:05:51 UTC (rev 2470)
+++ trunk/mmaker/libmorphix/makemodule.c 2007-04-05 19:45:09 UTC (rev 2471)
@@ -550,7 +550,7 @@
gchar *http_s = "http://";
if (strncmp(r->from,http_s,strlen(http_s)) == 0) {
- gchar *cmdline = g_strdup_printf("wget -O %s/%s %s",module->dirname,r->to,r->from);
+ gchar *cmdline = g_strdup_printf("wget -P %s/%s %s",module->dirname,r->to,r->from);
if (!ExecuteCommand(cmdline)) {
fprintf(stderr,"Warning: unable to execute retrieval: %s\n",r->from);
}
Modified: trunk/mmaker/utils/local_autobuilds.sh
===================================================================
--- trunk/mmaker/utils/local_autobuilds.sh 2007-04-03 22:05:51 UTC (rev 2470)
+++ trunk/mmaker/utils/local_autobuilds.sh 2007-04-05 19:45:09 UTC (rev 2471)
@@ -3,7 +3,6 @@
#
# GPL V2 or later
#
-#local_build mini upload_file_dir local_file_dir template_dir
MODULE_TYPE="$1"
TEMPLATE_DIR="$2"
LOCAL_DIR="$3"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: Brendan M. S. <me...@ba...> - 2007-04-06 18:28:00
|
Hi All,
I have had a re-think on the patch I submitted. It works for examples such as:-
<retrieve>
<from>http://foo.com/bar.deb</from>
<to>/tmp/</to>
</retrieve>
However, it will not work for examples such as:-
<retrieve>
<from>http://foo.com/bar.txt</from>
<to>/tmp/foo.txt</to>
</retrieve>
Below is another improved patch. However my c skills are very, very
rusty. I can not remember the last time I did some c. Please can
someone review my 1337 coding, before it is submitted to the svn
repository.
Regards,
Brendan
Index: makemodule.c
===================================================================
--- makemodule.c (revision 2471)
+++ makemodule.c (working copy)
@@ -550,7 +550,17 @@
gchar *http_s = "http://";
if (strncmp(r->from,http_s,strlen(http_s)) == 0) {
- gchar *cmdline = g_strdup_printf("wget
-P %s/%s %s",module->dirname,r->to,r->from);
+ #If the last charactor of r->from is a
/ then we need wget -P else wget -O
+ char * pch;
+ char wgetopt;
+ pch=strrchr(r->from,'/');
+ if (pch-r->from == strlen(r->from)-1) {
+ wgetopt='P';
+ }
+ else {
+ wgetopt='O';
+ }
+ gchar *cmdline = g_strdup_printf("wget
-%c %s/%s %s",wgetopt,module->dirname,r->to,r->from);
if (!ExecuteCommand(cmdline)) {
fprintf(stderr,"Warning:
unable to execute retrieval: %s\n",r->from);
}
|
|
From: <ale...@us...> - 2007-04-06 20:08:08
|
Revision: 2473
http://svn.sourceforge.net/morphix/?rev=2473&view=rev
Author: alextreme
Date: 2007-04-06 13:08:04 -0700 (Fri, 06 Apr 2007)
Log Message:
-----------
* new upload, with bmsleight's patch
Modified Paths:
--------------
trunk/mmaker/debian/changelog
trunk/mmaker/libmorphix/makemini.c
trunk/mmaker/libmorphix/makemodule.c
Modified: trunk/mmaker/debian/changelog
===================================================================
--- trunk/mmaker/debian/changelog 2007-04-06 19:22:45 UTC (rev 2472)
+++ trunk/mmaker/debian/changelog 2007-04-06 20:08:04 UTC (rev 2473)
@@ -1,7 +1,14 @@
+morphix-mmaker (0.4-39) unstable; urgency=low
+
+ * bmsleight's makemodule improvement (retrieve-to-directory patch)
+
+ -- root <ro...@al...> Fri, 6 Apr 2007 22:03:03 +0200
+
morphix-mmaker (0.4-38) unstable; urgency=low
+ * fixing dependancies
* Fix for remote retrieve of files
-
+
-- bmsleight <bms...@ba...> Thu, 05 Apr 2007 21:00:00 +0100
morphix-mmaker (0.4-37) unstable; urgency=low
Modified: trunk/mmaker/libmorphix/makemini.c
===================================================================
--- trunk/mmaker/libmorphix/makemini.c 2007-04-06 19:22:45 UTC (rev 2472)
+++ trunk/mmaker/libmorphix/makemini.c 2007-04-06 20:08:04 UTC (rev 2473)
@@ -158,7 +158,7 @@
gboolean update = FALSE; // should add another argument for this one
FILE *file;
- if (user == NULL) {
+ if (user == NULL && save_overlay == FALSE) {
return FALSE;
}
Modified: trunk/mmaker/libmorphix/makemodule.c
===================================================================
--- trunk/mmaker/libmorphix/makemodule.c 2007-04-06 19:22:45 UTC (rev 2472)
+++ trunk/mmaker/libmorphix/makemodule.c 2007-04-06 20:08:04 UTC (rev 2473)
@@ -550,7 +550,7 @@
gchar *http_s = "http://";
if (strncmp(r->from,http_s,strlen(http_s)) == 0) {
- #If the last charactor of r->from is a / then we need wget -P else wget -O
+ // If the last charactor of r->from is a / then we need wget -P else wget -O
char * pch;
char wgetopt;
pch=strrchr(r->from,'/');
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bms...@us...> - 2007-04-08 01:20:41
|
Revision: 2483
http://svn.sourceforge.net/morphix/?rev=2483&view=rev
Author: bmsleight
Date: 2007-04-07 18:20:40 -0700 (Sat, 07 Apr 2007)
Log Message:
-----------
changing r->from to r->to, silly boy.
Modified Paths:
--------------
trunk/mmaker/debian/changelog
trunk/mmaker/libmorphix/makemodule.c
Modified: trunk/mmaker/debian/changelog
===================================================================
--- trunk/mmaker/debian/changelog 2007-04-07 23:11:59 UTC (rev 2482)
+++ trunk/mmaker/debian/changelog 2007-04-08 01:20:40 UTC (rev 2483)
@@ -1,3 +1,9 @@
+morphix-mmaker (0.4-40) unstable; urgency=low
+
+ * bump - beacuse bmsleight is silly
+
+ -- bmsleight <bms...@ba...> Sun, 08 Apr 2007 02:20:00 +0100
+
morphix-mmaker (0.4-39) unstable; urgency=low
* bmsleight's makemodule improvement (retrieve-to-directory patch)
Modified: trunk/mmaker/libmorphix/makemodule.c
===================================================================
--- trunk/mmaker/libmorphix/makemodule.c 2007-04-07 23:11:59 UTC (rev 2482)
+++ trunk/mmaker/libmorphix/makemodule.c 2007-04-08 01:20:40 UTC (rev 2483)
@@ -550,11 +550,11 @@
gchar *http_s = "http://";
if (strncmp(r->from,http_s,strlen(http_s)) == 0) {
- // If the last charactor of r->from is a / then we need wget -P else wget -O
+ // If the last charactor of _r->to_ is a / then we need wget -P else wget -O
char * pch;
char wgetopt;
- pch=strrchr(r->from,'/');
- if (pch-r->from == strlen(r->from)-1) {
+ pch=strrchr(r->to,'/');
+ if (pch-r->to == strlen(r->to)-1) {
wgetopt='P';
}
else {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pa...@us...> - 2007-05-24 10:47:16
|
Revision: 2494
http://svn.sourceforge.net/morphix/?rev=2494&view=rev
Author: paul_c
Date: 2007-05-24 03:47:06 -0700 (Thu, 24 May 2007)
Log Message:
-----------
Update to reflect recent changes to Debian now that Etch is stable..
The veritable old debootstrap program appears to have been superceeded by
cdebootstrap - This accepts stable/testing as a suite along with lenny.
Added bonus, the base.mod should be smaller (may need to add stuff to
templates to avoid breakages).
Modified Paths:
--------------
trunk/mmaker/debian/control
trunk/mmaker/libmorphix/makebase.c
trunk/mmaker/libmorphix/makemain.c
trunk/mmaker/libmorphix/makemodule.c
trunk/mmaker/libmorphix/makemodule.h
trunk/mmaker/libmorphix/parsemod.h
trunk/mmaker/utils/build-example.sh
trunk/mmaker/utils/local_autobuilds.sh
Modified: trunk/mmaker/debian/control
===================================================================
--- trunk/mmaker/debian/control 2007-05-22 15:34:42 UTC (rev 2493)
+++ trunk/mmaker/debian/control 2007-05-24 10:47:06 UTC (rev 2494)
@@ -7,7 +7,7 @@
Package: morphix-mmaker
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, debootstrap, cloop-utils, mkisofs | genisoimage, makedev, mkminiroot-morphix, morphix-deb-get, morphix-make-iso, morphix-modulebuilder (>= 0.2-12), coreutils | schroot, morphix-morphmini
+Depends: ${shlibs:Depends}, ${misc:Depends}, cdebootstrap, cloop-utils, mkisofs | genisoimage, makedev, mkminiroot-morphix, morphix-deb-get, morphix-make-iso, morphix-modulebuilder (>= 0.2-12), coreutils | schroot, morphix-morphmini
Description: Module Maker, builds morphix modules
Module Maker, or mmaker, builds Morphix base and mainmodules
from scratch. As input it takes an XML template, containing
Modified: trunk/mmaker/libmorphix/makebase.c
===================================================================
--- trunk/mmaker/libmorphix/makebase.c 2007-05-22 15:34:42 UTC (rev 2493)
+++ trunk/mmaker/libmorphix/makebase.c 2007-05-24 10:47:06 UTC (rev 2494)
@@ -80,7 +80,7 @@
gchar *filename = NULL;
FILE *fd = NULL;
if (module->suite == NULL) {
- fprintf(stderr,"Error: you need to add the suite for a basemodule (woody, sarge, sid)\n");
+ fprintf(stderr,"Error: you need to add the suite for a basemodule (etch, lenny, sid)\n");
return FALSE;
}
if (module->dirname == NULL) {
Modified: trunk/mmaker/libmorphix/makemain.c
===================================================================
--- trunk/mmaker/libmorphix/makemain.c 2007-05-22 15:34:42 UTC (rev 2493)
+++ trunk/mmaker/libmorphix/makemain.c 2007-05-24 10:47:06 UTC (rev 2494)
@@ -61,7 +61,7 @@
gboolean initMainModule(mmodule *module,gchar *xmlfilename, gchar *debtarball, gchar *debbzip2, gchar *debootdir) {
gchar *cmdline;
if (module->suite == NULL) {
- fprintf(stderr,"Error: you need to add the suite for a mainmodule (woody, sarge, sid)\n");
+ fprintf(stderr,"Error: you need to add the suite for a mainmodule (etch, lenny, sid)\n");
return FALSE;
}
if (module->repositorylist == NULL) {
Modified: trunk/mmaker/libmorphix/makemodule.c
===================================================================
--- trunk/mmaker/libmorphix/makemodule.c 2007-05-22 15:34:42 UTC (rev 2493)
+++ trunk/mmaker/libmorphix/makemodule.c 2007-05-24 10:47:06 UTC (rev 2494)
@@ -1160,9 +1160,11 @@
fprintf(stderr,"Error: Temporary dirname not set, aborting...\n");
return FALSE;
}
- if (strcmp(module->suite,"woody") != 0 && strcmp(module->suite,"stable") != 0 &&
- strcmp(module->suite,"sarge") != 0 && strcmp(module->suite,"testing") != 0 &&
- strcmp(module->suite,"sid") != 0 && strcmp(module->suite,"unstable") != 0) {
+ if (/* woody has been archived, and sarge is now oldstable (2007) */
+ strcmp(module->suite,"sarge") != 0 && strcmp(module->suite,"oldstable") != 0 &&
+ strcmp(module->suite,"etch") != 0 && strcmp(module->suite,"stable") != 0 &&
+ strcmp(module->suite,"lenny") != 0 && strcmp(module->suite,"testing") != 0 &&
+ strcmp(module->suite,"sid") != 0 && strcmp(module->suite,"unstable") != 0) {
fprintf(stderr,"Warning: module suite unknown, continuing\n");
}
ptr = module->repositorylist;
Modified: trunk/mmaker/libmorphix/makemodule.h
===================================================================
--- trunk/mmaker/libmorphix/makemodule.h 2007-05-22 15:34:42 UTC (rev 2493)
+++ trunk/mmaker/libmorphix/makemodule.h 2007-05-24 10:47:06 UTC (rev 2494)
@@ -7,7 +7,8 @@
// default paths to common tools
// might use $PATH instead...
#define P_DEPMOD "/sbin/depmod"
-#define P_DEBOOTSTRAP "/usr/sbin/debootstrap"
+//#define P_DEBOOTSTRAP "/usr/sbin/debootstrap"
+#define P_DEBOOTSTRAP "/usr/bin/cdebootstrap"
#define P_ETC_APT_SOURCES "/etc/apt/sources.list"
#define P_CHROOT "/usr/sbin/chroot"
#define P_MKISOFS "/usr/bin/mkisofs"
Modified: trunk/mmaker/libmorphix/parsemod.h
===================================================================
--- trunk/mmaker/libmorphix/parsemod.h 2007-05-22 15:34:42 UTC (rev 2493)
+++ trunk/mmaker/libmorphix/parsemod.h 2007-05-24 10:47:06 UTC (rev 2494)
@@ -38,7 +38,7 @@
char *name; // natural language name
char *description; // natural language description
char *type; // mainmod/minimod/basemod/...
- char *suite; // woody/sarge/sid/...
+ char *suite; // sarge/etch/lenny/sid/...
char *arch; // optional architecture you're building for (see www.debian.org/ports for uptodate list of names) Please note that cross-building isn't likely to succeed!
char *proxy; // proxy URI in the form of http://proxy.mydomain.com:8080
Modified: trunk/mmaker/utils/build-example.sh
===================================================================
--- trunk/mmaker/utils/build-example.sh 2007-05-22 15:34:42 UTC (rev 2493)
+++ trunk/mmaker/utils/build-example.sh 2007-05-24 10:47:06 UTC (rev 2494)
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
MAINMODS="templates/lightgui.xml templates/verylightgui.xml templates/morphix-kde.xml"
Modified: trunk/mmaker/utils/local_autobuilds.sh
===================================================================
--- trunk/mmaker/utils/local_autobuilds.sh 2007-05-22 15:34:42 UTC (rev 2493)
+++ trunk/mmaker/utils/local_autobuilds.sh 2007-05-24 10:47:06 UTC (rev 2494)
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
# Copyright (c) 2004, Brendan M. Sleight <bmsleight@barwap._REMOVE_SPAM_TRAP.com>
#
# GPL V2 or later
@@ -56,5 +56,3 @@
# delete all files in WORKING_DIR after 3 days
find $LOCAL_DIR/[^local]* -ctime +1 -exec sudo rm {} \;
-
-
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bms...@us...> - 2007-06-23 07:59:41
|
Revision: 2525
http://svn.sourceforge.net/morphix/?rev=2525&view=rev
Author: bmsleight
Date: 2007-06-23 00:59:36 -0700 (Sat, 23 Jun 2007)
Log Message:
-----------
Update to MorphixLiveKiosk Template - using etch, preparing for a long-term support release of MLK-Building Templates, ready for a new MorphingMorphix. Adding a quick list of the packages needed to run a AutoTesting machine, (Might be worth building an V/Qemu Image at some point). To Do: Expand on AutoTesting vnc session, so that x-session is not required - look at vncrec
Modified Paths:
--------------
trunk/mmaker/templates/morphix-livekiosk.xml
Added Paths:
-----------
trunk/mmaker/utils/auto-testing/Required-Packages.txt
Modified: trunk/mmaker/templates/morphix-livekiosk.xml
===================================================================
--- trunk/mmaker/templates/morphix-livekiosk.xml 2007-06-21 22:11:39 UTC (rev 2524)
+++ trunk/mmaker/templates/morphix-livekiosk.xml 2007-06-23 07:59:36 UTC (rev 2525)
@@ -1,20 +1,18 @@
<comps>
<group>
- <version>0.5</version>
- <id>firefox</id>
+ <version>0.1</version>
+ <id>MorphixLiveKiosk</id>
<name>Morphix LiveKiosk</name>
<repositorylist>
<repository type="debian">ftp://ftp.debian.org/debian</repository>
<repository type="plain" suite="unstable">http://www.morphix.org/debian</repository>
- <!-- Updates and security packages.. -->
- <!-- <repository type="debian" suite="etch/updates">http://ftp.debian.org/debian/debian-security/</repository> -->
+ <repository type="debian" suite="etch/updates">http://ftp.debian.org/debian/debian-security/</repository>
</repositorylist>
<description>Morphix Live Kiosk mainmodule. Outline template, LiveCD will have a single application running full screen</description>
<type>mainmod</type>
- <suite>sid</suite>
+ <suite>etch</suite>
<packagelist>
-<!-- remove exim4 exim4-base exim4-config mailx ? -->
<packagereq>alsa-base</packagereq>
<packagereq>alsa-utils</packagereq>
<packagereq>bzip2</packagereq>
@@ -29,7 +27,6 @@
<packagereq>menu</packagereq>
<packagereq>menu-xdg</packagereq>
<packagereq>module-init-tools</packagereq> <!-- necessary for kernels 2.5+ -->
-<packagereq>most</packagereq>
<packagereq>mozplugger</packagereq>
<packagereq>pcmcia-cs</packagereq>
<packagereq>perl-modules</packagereq>
@@ -58,19 +55,11 @@
<!-- These alternatives do not work well yet - hence comment out -->
<!-- <packagereq>gcjwebplugin</packagereq> -->
<!-- <packagereq>kaffe</packagereq> -->
-
<!-- Used for testing/debuging version -->
-<!-- <packagereq>xterm</packagereq> -->
<!-- <packagereq>openssh-server</packagereq> -->
</packagelist>
-<!-- Stop bookmarks toolbar from appearing -->
-<retrieve>
- <from>http://morphix.svn.sourceforge.net/viewvc/*checkout*/morphix/trunk/morphixlivekiosk/misc/localstore.rdf</from>
- <to>/etc/iceweasel/profile/</to>
- </retrieve>
-
-<!-- The single application does not neet documentation or manuals -->
+<!-- The single application does not neet documentation, manuals or other consoles -->
<commandlist>
<command>rm -rf /usr/share/doc</command>
<command>rm -rf /usr/share/man</command>
Added: trunk/mmaker/utils/auto-testing/Required-Packages.txt
===================================================================
--- trunk/mmaker/utils/auto-testing/Required-Packages.txt (rev 0)
+++ trunk/mmaker/utils/auto-testing/Required-Packages.txt 2007-06-23 07:59:36 UTC (rev 2525)
@@ -0,0 +1,1010 @@
+imagemagick
+debian-multimedia-keyring
+ffmpeg
+ffmpeg2theora
+mplayer
+morphing-tools
+subversion-tools
+qemu
+rsync
+mkisofs
+mencoder
+build-essential
+debhelper
+
+Desired=Unknown/Install/Remove/Purge/Hold
+| Status=Not/Installed/Config-files/Unpacked/Failed-config/Half-installed
+|/ Err?=(none)/Hold/Reinst-required/X=both-problems (Status,Err: uppercase=bad)
+||/ Name Version Description
++++-=================================-===============================-============================================
+ii acpid 1.0.4-7.1 Utilities for using ACPI power management
+ii adduser 3.102 Add and remove users and groups
+ii alacarte 0.11.3-1 easy GNOME menu editing tool
+ii alsa-base 1.0.13-5 ALSA driver configuration files
+ii alsa-utils 1.0.13-2 ALSA utilities
+ii anacron 2.3-13 cron-like program that doesn't go by time
+ii apt 0.6.46.4-0.1 Advanced front-end for dpkg
+ii apt-utils 0.6.46.4-0.1 APT utility programs
+ii aptitude 0.4.4-4 terminal-based apt frontend
+ii at 3.1.10 Delayed job execution and batch processing
+ii avahi-daemon 0.6.16-5 Avahi mDNS/DNS-SD daemon
+ii base-files 4.0.0 Debian base system miscellaneous files
+ii base-passwd 3.5.11 Debian base system master password and group
+ii bash 3.1dfsg-8 The GNU Bourne Again SHell
+ii bc 1.06-20 The GNU bc arbitrary precision calculator la
+ii bind9-host 1:9.4.1-1 Version of 'host' bundled with BIND 9.X
+ii binutils 2.17cvs20070426-8 The GNU assembler, linker and binary utiliti
+ii bittorrent 3.4.2-11 Original BitTorent client - console tools
+ii bluez-gnome 0.6-1 Bluetooth utilities for GNOME
+ii bochsbios 2.3-2 BIOS for the Bochs emulator
+ii bsdmainutils 6.1.6 collection of more utilities from FreeBSD
+ii bsdutils 1:2.12r-19 Basic utilities from 4.4BSD-Lite
+ii bsh 2.0b4-4 Java scripting environment (BeanShell) Versi
+ii bug-buddy 2.14.0-4 GNOME Desktop Environment bug reporting tool
+ii build-essential 11.3 informational list of build-essential packag
+ii busybox 1:1.1.3-4 Tiny utilities for small and embedded system
+ii bzip2 1.0.3-6 high-quality block-sorting file compressor -
+ii ca-certificates 20070303 Common CA Certificates PEM files
+ii capplets-data 1:2.14.2-7 configuration applets for GNOME 2 - data fil
+ii cdebootstrap 0.3.15 Bootstrap a Debian system
+ii cdrdao 1:1.2.2-6 records CDs in Disk-At-Once (DAO) mode
+ii cloop-utils 2.05~20060829-1 Tools for handling with cloop compressed vol
+ii console-common 0.7.69 Basic infrastructure for text console config
+ii console-data 2:1.01-7 Keymaps, fonts, charset maps, fallback table
+ii console-tools 1:0.2.3dbs-65 Linux console and font utilities
+ii coreutils 5.97-5.3 The GNU core utilities
+ii cpio 2.7-3 GNU cpio -- a program to manage archives of
+ii cpp 4:4.1.1-15 The GNU C preprocessor (cpp)
+ii cpp-4.1 4.1.1-21 The GNU C preprocessor
+ii cron 3.0pl1-100 management of regular background processing
+ii cupsys 1.2.11-2 Common UNIX Printing System(tm) - server
+ii cupsys-bsd 1.2.11-2 Common UNIX Printing System(tm) - BSD comman
+ii cupsys-client 1.2.11-2 Common UNIX Printing System(tm) - client pro
+ii cupsys-common 1.2.11-2 Common UNIX Printing System(tm) - common fil
+ii cupsys-driver-gutenprint 5.0.0-3 printer drivers for CUPS
+ii dbus 1.0.2-1 simple interprocess messaging system
+ii dbus-1-utils 1.0.2-1 simple interprocess messaging system (utilit
+ii dc 1.06-20 The GNU dc arbitrary precision reverse-polis
+ii debconf 1.5.13 Debian configuration management system
+ii debconf-i18n 1.5.13 full internationalization support for debcon
+ii debhelper 5.0.50 helper programs for debian/rules
+ii debian-archive-keyring 2007.02.19-0.1 GnuPG archive keys of the Debian archive
+ii debian-multimedia-keyring 2007.02.14 GnuPG archive key of the debian-multimedia r
+ii debianutils 2.19 Miscellaneous utilities specific to Debian
+ii defoma 0.11.10-0.1 Debian Font Manager -- automatic font config
+ii deskbar-applet 2.14.2-4.2 universal search and navigation bar for GNOM
+ii desktop-base 4.0.3 common files for the Debian Desktop
+ii desktop-file-utils 0.12-1 Utilities for .desktop files
+ii devscripts 2.10.4 Scripts to make the life of a Debian Package
+ii dhcdbd 2.0-5 D-Bus interface to the ISC DHCP client
+ii dhcp3-client 3.0.4-14 DHCP Client
+ii dhcp3-common 3.0.4-14 Common files used by all the dhcp3* packages
+ii dictionaries-common 0.81.2 Common utilities for spelling dictionary too
+ii diff 2.8.1-12 File comparison utilities
+ii discover1 1.7.21 hardware identification system
+ii discover1-data 2.2007.05.11 Data lists for Discover hardware detection s
+ii dmidecode 2.9-1 Dump Desktop Management Interface data
+ii dnsutils 1:9.4.1-1 Clients provided with BIND
+ii doc-debian 3.1.5 Debian Project documentation, Debian FAQ and
+ii doc-linux-text 2007.05-1 Linux HOWTOs and FAQs in ASCII format
+ii docbook-xml 4.5-4 standard XML documentation system, for softw
+ii dpkg 1.14.4 package maintenance system for Debian
+ii dpkg-dev 1.14.4 package building tools for Debian
+ii dselect 1.14.4 user tool to manage Debian packages
+ii dvd+rw-tools 7.0-7 DVD+-RW/R tools
+ii e2fslibs 1.39+1.40-WIP-2006.11.14+dfsg-2 ext2 filesystem libraries
+ii e2fsprogs 1.39+1.40-WIP-2006.11.14+dfsg-2 ext2 file system utilities and libraries
+ii ed 0.2-20 The classic unix line editor
+ii eject 2.1.5-2 ejects CDs and operates CD-Changers under Li
+ii ekiga 2.0.3-6 H.323 and SIP compatible VOIP client
+ii eog 2.16.3-3 Eye of Gnome graphics viewer program
+ii epiphany-browser 2.14.3-6 Intuitive GNOME web browser
+ii epiphany-extensions 2.14.1.1-3 Extensions for Epiphany web browser
+ii esound 0.2.36-3 Enlightened Sound Daemon - Support binaries
+ii esound-common 0.2.36-3 Enlightened Sound Daemon - Common files
+ii evince 0.4.0-5 Document (postscript, pdf) viewer
+ii evolution 2.6.3-6 groupware suite with mail client and organiz
+ii evolution-common 2.6.3-6 architecture independent files for Evolution
+ii evolution-data-server 1.6.3-5 evolution database backend server
+ii evolution-data-server-common 1.6.3-5 architecture independent files for Evolution
+ii evolution-exchange 2.6.3.dfsg-1 Exchange plugin for the Evolution groupware
+ii evolution-plugins 2.6.3-6 standard plugins for Evolution
+ii evolution-webcal 2.6.0-1+b1 webcal: URL handler for GNOME and Evolution
+ii exim4 4.63-17 metapackage to ease exim MTA (v4) installati
+ii exim4-base 4.63-17 support files for all exim MTA (v4) packages
+ii exim4-config 4.63-17 configuration for the exim MTA (v4)
+ii exim4-daemon-light 4.63-17 lightweight exim MTA (v4) daemon
+ii fast-user-switch-applet 2.14.2-1 Applet for the GNOME panel providing a menu
+ii fbset 2.1-19 framebuffer device maintenance program
+ii ffmpeg 3:20070329-0.0 audio/video encoder, streaming server & audi
+ii ffmpeg2theora 0.16-2+b1 Theora video encoder using ffmpeg
+ii file 4.20-8 Determines file type using "magic" numbers
+ii file-roller 2.14.4-3 an archive manager for GNOME
+ii findutils 4.2.31-1 utilities for finding files--find, xargs, an
+ii finger 0.17-11 user information lookup program
+ii fontconfig 2.4.2-1.2 generic font configuration library - support
+ii fontconfig-config 2.4.2-1.2 generic font configuration library - configu
+ii foomatic-db 20061031-1 linuxprinting.org printer support - database
+ii foomatic-db-engine 3.0.2-20061031-1 linuxprinting.org printer support - programs
+ii foomatic-db-gutenprint 5.0.0-3 linuxprinting.org printer support - database
+ii foomatic-db-hpijs 20061031-1 linuxprinting.org printer support - database
+ii foomatic-filters 3.0.2-20061031-1.2 linuxprinting.org printer support - filters
+ii foomatic-filters-ppds 20061104-1 linuxprinting.org printer support - prebuilt
+ii foomatic-gui 0.7.7 GNOME interface for configuring the Foomatic
+ii fortune-mod 1:1.99.1-3 provides fortune cookies on demand
+ii fortunes-min 1:1.99.1-3 Data files containing fortune cookies
+ii ftp 0.17-16 The FTP client
+ii g++ 4:4.1.1-15 The GNU C++ compiler
+ii g++-4.1 4.1.1-21 The GNU C++ compiler
+ii gaim 1:2.0.0+beta5-11 multi-protocol instant messaging client
+ii gaim-data 1:2.0.0+beta5-11 multi-protocol instant messaging client - da
+ii gamin 0.1.8-2 File and directory monitoring system
+ii gcalctool 5.8.25-1 A GTK2 desktop calculator
+ii gcc 4:4.1.1-15 The GNU C compiler
+ii gcc-3.4-base 3.4.6-5 The GNU Compiler Collection (base package)
+ii gcc-4.1 4.1.1-21 The GNU C compiler
+ii gcc-4.1-base 4.1.1-21 The GNU Compiler Collection (base package)
+ii gcc-4.2-base 4.2-20070528-1 The GNU Compiler Collection (base package)
+ii gcj-4.1-base 4.1.1-20 The GNU Compiler Collection (gcj base packag
+ii gconf-editor 2.16.0-2 An editor for the GConf configuration system
+ii gconf2 2.18.0.1-3 GNOME configuration database system (support
+ii gconf2-common 2.18.0.1-3 GNOME configuration database system (common
+ii gdb 6.4.90.dfsg-1 The GNU Debugger
+ii gdebi 0.1.6-0.1 Simple tool to install deb files
+ii gdm 2.16.4-1.1 GNOME Display Manager
+ii gedit 2.14.4-9 official text editor of the GNOME desktop en
+ii gedit-common 2.14.4-9 official text editor of the GNOME desktop en
+ii genisoimage 9:1.1.6-1 Creates ISO-9660 CD-ROM filesystem images
+ii gettext 0.16.1-1 GNU Internationalization utilities
+ii gettext-base 0.16.1-1 GNU Internationalization utilities for the b
+ii gfxboot 2.4-1 create menu message files suitable for bootl
+ii gij 4:4.1.1-15 The GNU Java bytecode interpreter
+ii gij-4.1 4.1.1-20 The GNU Java bytecode interpreter
+ii gimp 2.2.13-1 The GNU Image Manipulation Program
+ii gimp-data 2.2.13-1 Data files for The GIMP
+ii gimp-print 5.0.0-3 print plugin for the GIMP
+ii gksu 2.0.0-4 graphical frontend to su
+ii gnome-about 2.18.2-1 The GNOME about box
+ii gnome-applets 2.14.3-6 Various applets for GNOME 2 panel - binary f
+ii gnome-applets-data 2.14.3-6 Various applets for GNOME 2 panel - data fil
+ii gnome-backgrounds 2.16.2-1 a set of backgrounds packaged with the GNOME
+ii gnome-btdownload 0.0.28-1 Gnome interface for 'executing' BitTorrent f
+ii gnome-cards-data 1:2.16.3-1 data files for the GNOME card games
+ii gnome-control-center 1:2.14.2-7 utilities to configure the GNOME desktop
+ii gnome-core 1:2.14.3.6 The GNOME Desktop Environment -- essential c
+ii gnome-cups-manager 0.31-3 CUPS printer admin tool for GNOME
+ii gnome-desktop-data 2.18.2-1 Common files for GNOME 2 desktop apps
+ii gnome-desktop-environment 1:2.14.3.6 The GNOME Desktop Environment
+ii gnome-doc-utils 0.10.3-1 a collection of documentation utilities for
+ii gnome-games 1:2.16.3-1 games for the GNOME desktop
+ii gnome-games-data 1:2.16.3-1 data files for the GNOME games
+ii gnome-icon-theme 2.18.0-2 GNOME Desktop icon theme
+ii gnome-keyring 0.8.1-2 GNOME keyring services (daemon and tools)
+ii gnome-keyring-manager 2.16.0-2 keyring management program for the GNOME des
+ii gnome-media 2.14.2-4 GNOME media utilities
+ii gnome-media-common 2.14.2-4 GNOME media utilities - common files
+ii gnome-menus 2.18.2-1 an implementation of the freedesktop menu sp
+ii gnome-mime-data 2.18.0-1 base MIME and Application database for GNOME
+ii gnome-netstatus-applet 2.12.1-1 Network status applet for GNOME 2
+ii gnome-nettool 2.14.2-1 network information tool for GNOME
+ii gnome-panel 2.14.3-5 launcher and docking facility for GNOME 2
+ii gnome-panel-data 2.14.3-5 common files for GNOME 2 panel
+ii gnome-power-manager 2.14.3-3+b1 frontend for gnome-powermanager
+ii gnome-screensaver 2.14.3-3 GNOME screen saver and locker
+ii gnome-session 2.14.3-6 The GNOME 2 Session Manager
+ii gnome-system-monitor 2.14.5-1 Process viewer and system resource monitor f
+ii gnome-system-tools 2.14.0-3 Cross-platform configuration utilities for G
+ii gnome-terminal 2.14.2-2 The GNOME 2 terminal emulator application
+ii gnome-terminal-data 2.14.2-2 Data files for the GNOME terminal emulator
+ii gnome-themes 2.18.1-2 official themes for the GNOME 2 desktop
+ii gnome-themes-extras 0.9.0.deb0.2 various themes for the GNOME 2 desktop
+ii gnome-user-guide 2.18.1-1 GNOME user's guide
+ii gnome-utils 2.14.0.dfsg-5 GNOME desktop utilities
+ii gnome-volume-manager 1.5.15-2 GNOME daemon to auto-mount and manage media
+ii gnomebaker 0.6.0-7 application for CD/DVD creation in the GNOME
+ii gnupg 1.4.6-2 GNU privacy guard - a free PGP replacement
+ii gparted 0.3.3-2 GNOME partition editor
+ii gpgv 1.4.6-2 GNU privacy guard - signature verification t
+ii grdesktop 0.23-3 GNOME frontend for the rdesktop client
+ii grep 2.5.1.ds2-6 GNU grep, egrep and fgrep
+ii groff-base 1.18.1.1-12 GNU troff text-formatting system (base syste
+ii grub 0.97-27 GRand Unified Bootloader
+ii gs-common 0.3.13 Common files for different Ghostscript relea
+ii gs-esp 8.15.3.dfsg.1-1 The Ghostscript PostScript interpreter - ESP
+ii gsfonts 1:8.11+urwcyr1.0.7~pre41-3 Fonts for the Ghostscript interpreter(s)
+ii gstreamer0.10-alsa 0.10.13-2 GStreamer plugin for ALSA
+ii gstreamer0.10-esd 0.10.4-4 GStreamer plugin for ESD
+ii gstreamer0.10-ffmpeg 0.10.2-2 FFmpeg plugin for GStreamer
+ii gstreamer0.10-gnomevfs 0.10.13-2 GStreamer plugin for GnomeVFS
+ii gstreamer0.10-plugins-base 0.10.13-2 GStreamer plugins from the "base" set
+ii gstreamer0.10-plugins-good 0.10.4-4 GStreamer plugins from the "good" set
+ii gstreamer0.10-plugins-ugly 0.10.5-2 GStreamer plugins from the "ugly" set
+ii gtk2-engines 1:2.10.2-1 theme engines for GTK+ 2.x
+ii gtk2-engines-pixbuf 2.10.12-2 Pixbuf-based theme for GTK+ 2.x
+ii gtk2-engines-xfce 2.4.1-1 A GTK+-2.0 theme engine for Xfce
+ii gtkhtml3.8 3.12.1-2 HTML rendering/editing library - bonobo comp
+ii gucharmap 1:1.6.0-1 Unicode character picker and font browser
+ii guile-1.6-libs 1.6.8-6 Main Guile libraries
+ii gzip 1.3.9-2 The GNU compression utility
+ii hal 0.5.9-3 Hardware Abstraction Layer
+ii hal-info 20070516-1 Hardware Abstraction Layer - fdi files
+ii hardinfo 0.4.2.1.svn30042007-1 Displays system information
+ii hicolor-icon-theme 0.10-1 default fallback theme for FreeDesktop.org i
+ii hostname 2.93 utility to set/show the host name or domain
+ii hotkey-setup 0.1-17 auto-configures laptop hotkeys
+ii hpijs 2.6.10+1.6.10-3 HP Linux Printing and Imaging - gs IJS drive
+ii hpijs-ppds 2.6.10+1.6.10-3 HP Linux Printing and Imaging - HPIJS PPD fi
+ii hplip 1.6.10-3 HP Linux Printing and Imaging System (HPLIP)
+ii hplip-data 1.6.10-3 HP Linux Printing and Imaging - data files
+ii html2text 1.3.2a-3 An advanced HTML to text converter
+ii iamerican 3.1.20.0-4.4 An American English dictionary for ispell
+ii ibritish 3.1.20.0-4.4 A British English dictionary for ispell
+ii icedax 9:1.1.6-1 Creates WAV files from audio CDs
+ii iceweasel 2.0.0.3-1 lightweight web browser based on Mozilla
+ii iceweasel-gnome-support 2.0.0.3-1 Support for Gnome in Iceweasel
+ii iceweasel-l10n-en-gb 2.0.0.3+debian-2 English (Great Britain) language package for
+ii ifupdown 0.6.8 high level tools to configure network interf
+ii ijsgutenprint 5.0.0-3 inkjet server - Ghostscript driver for Guten
+ii imagemagick 7:6.2.4.5.dfsg1-0.14 Image manipulation programs
+ii industrial-cursor-theme 0.6.1.3 flat-looking cursor theme for X
+ii info 4.8.dfsg.1-6 Standalone GNU Info documentation browser
+ii initramfs-tools 0.87b tools for generating an initramfs
+ii initscripts 2.86.ds1-38 Scripts for initializing and shutting down t
+ii installation-report 2.29 system installation report
+ii intltool-debian 0.35.0+20060710.1 Help i18n of RFC822 compliant config files
+ii iproute 20061002-4 Professional tools to control the networking
+ii iptables 1.3.6.0debian1-5 administration tools for packet filtering an
+ii iputils-arping 3:20070202-1 Tool to send ICMP echo requests to an ARP ad
+ii iputils-ping 3:20070202-1 Tools to test the reachability of network ho
+ii iso-codes 1.0a-1 ISO language, territory, currency codes and
+ii ispell 3.1.20.0-4.4 International Ispell (an interactive spellin
+ii kde-i18n-engb 4:3.5.6-1 British English (en_GB) internationalized (i
+ii kdelibs-data 4:3.5.5a.dfsg.1-8 core shared data for all KDE applications
+ii kdelibs4c2a 4:3.5.5a.dfsg.1-8 core libraries and binaries for all KDE appl
+ii klibc-utils 1.4.34-1 small statically-linked utilities built with
+ii klogd 1.4.1-20 Kernel Logging Daemon
+ii lapack3 3.0.20000531a-6 library of linear algebra routines 3 - share
+ii laptop-detect 0.12.1-0.1 attempt to detect a laptop
+ii less 394-4 Pager program similar to more
+ii liba52-0.7.4 0.7.4-11 library for decoding ATSC A/52 streams
+ii libaa1 1.4p5-32 ascii art library
+ii libacl1 2.2.42-1 Access control list shared library
+ii libao2 0.8.8-2 Cross Platform Audio Output Library
+ii libapm1 3.2.2-8.1 Library for interacting with APM driver in k
+ii libapr1 1.2.7-8.2 The Apache Portable Runtime Library
+ii libaprutil1 1.2.7+dfsg-2+b1 The Apache Portable Runtime Utility Library
+ii libart-2.0-2 2.3.19-3 Library of functions for 2D graphics - runti
+ii libarts1c2a 1.5.5-1 aRts sound system core components
+ii libartsc0 1.5.5-1 aRts sound system C support library
+ii libasound2 1.0.13-2 ALSA library
+ii libaspell15 0.60.5-1 GNU Aspell spell-checker runtime library
+ii libasyncns0 0.3-1 Asyncronous name service query library
+ii libatk1.0-0 1.18.0-2 The ATK accessibility toolkit
+ii libatm1 2.4.1-17 shared library for ATM (Asynchronous Transfe
+ii libattr1 1:2.4.32-1.1 Extended attribute shared library
+ii libaudio2 1.9-2 The Network Audio System (NAS). (shared libr
+ii libaudiofile0 0.2.6-6 Open-source version of SGI's audiofile libra
+ii libavahi-client3 0.6.16-5 Avahi client library
+ii libavahi-common-data 0.6.16-5 Avahi common data files
+ii libavahi-common3 0.6.16-5 Avahi common library
+ii libavahi-compat-howl0 0.6.16-5 Avahi Howl compatibility library
+ii libavahi-core4 0.6.16-5 Avahi's embeddable mDNS/DNS-SD library
+ii libavahi-glib1 0.6.16-5 Avahi glib integration library
+ii libavahi-qt3-1 0.6.16-5 Avahi Qt3 integration library
+ii libavc1394-0 0.5.3-1+b1 control IEEE 1394 audio/video devices
+ii libavcodec0d 0.cvs20060823-8 ffmpeg codec library
+ii libavcodeccvs51 3:20070329-0.0 library to encode decode multimedia streams
+ii libavformat0d 0.cvs20060823-8 ffmpeg file format library
+ii libavformatcvs51 3:20070329-0.0 ffmpeg file format library
+ii libavutilcvs49 3:20070329-0.0 avutil shared libraries
+ii libbind9-0 1:9.3.4-2 BIND9 Shared Library used by BIND
+ii libbind9-30 1:9.4.1-1 BIND9 Shared Library used by BIND
+ii libblkid1 1.39+1.40-WIP-2006.11.14+dfsg-2 block device id library
+ii libbluetooth2 3.10-1 Library to use the BlueZ Linux Bluetooth sta
+ii libbonobo2-0 2.18.0-2 Bonobo CORBA interfaces library
+ii libbonobo2-common 2.18.0-2 Bonobo CORBA interfaces library -- support f
+ii libbonoboui2-0 2.18.0-5 The Bonobo UI library
+ii libbonoboui2-common 2.18.0-5 The Bonobo UI library -- common files
+ii libbz2-1.0 1.0.3-6 high-quality block-sorting file compressor l
+ii libc6 2.5-9+b1 GNU C Library: Shared libraries
+ii libc6-dev 2.5-9+b1 GNU C Library: Development Libraries and Hea
+ii libc6-i686 2.5-9+b1 GNU C Library: Shared libraries [i686 optimi
+ii libcaca0 0.99.beta11.debian-3 colour ASCII art library
+ii libcairo-perl 1.01-1 Perl interface to the Cairo graphics library
+ii libcairo2 1.4.6-1.1 The Cairo 2D vector graphics library
+ii libcamel1.2-8 1.6.3-5 The Evolution MIME message handling library
+ii libcap1 1:1.10-14 support for getting/setting POSIX.1e capabil
+ii libcdio6 0.76-1 library to read and control CD-ROM
+ii libcdparanoia0 3.10+debian~pre0-5 audio extraction tool for sampling CDs (libr
+ii libcomerr2 1.39+1.40-WIP-2006.11.14+dfsg-2 common error description library
+ii libconsole 1:0.2.3dbs-65 Shared libraries for Linux console and font
+ii libcpufreq0 002-2 shared library to deal with the cpufreq Linu
+ii libcroco3 0.6.1-1 a generic Cascading Style Sheet (CSS) parsin
+ii libcucul0 0.99.beta11.debian-3 low-level Unicode character drawing library
+ii libcupsimage2 1.2.11-2 Common UNIX Printing System(tm) - image libs
+ii libcupsys2 1.2.11-2 Common UNIX Printing System(tm) - libs
+ii libcurl3 7.15.5-1 Multi-protocol file transfer library
+ii libdaemon0 0.10-1 lightweight C library for daemons
+ii libdatrie0 0.1.1-4 Double-array trie library
+ii libdb4.2 4.2.52+dfsg-2 Berkeley v4.2 Database Libraries [runtime]
+ii libdb4.3 4.3.29-8 Berkeley v4.3 Database Libraries [runtime]
+ii libdb4.4 4.4.20-8 Berkeley v4.4 Database Libraries [runtime]
+ii libdb4.5 4.5.20-1 Berkeley v4.5 Database Libraries [runtime]
+ii libdbus-1-3 1.0.2-1 simple interprocess messaging system
+ii libdbus-glib-1-2 0.73-2 simple interprocess messaging system (GLib-b
+ii libdc1394-13 1.1.0-3+b1 high level programming interface for IEEE139
+ii libdebian-installer-extra4 0.50 Library of some extra debian-installer funct
+ii libdebian-installer4 0.50 Library of common debian-installer functions
+ii libdevmapper1.02 2:1.02.08-1 The Linux Kernel Device Mapper userspace lib
+ii libdirectfb-0.9-25 0.9.25.1-5 direct frame buffer graphics - shared librar
+ii libdiscover1 1.7.21 hardware identification library
+ii libdjvulibre15 3.5.19-2 Runtime support for the DjVu image format
+ii libdmx1 1:1.0.2-2 X11 Distributed Multihead extension library
+ii libdns22 1:9.3.4-2 DNS Shared Library used by BIND
+ii libdns32 1:9.4.1-1 DNS Shared Library used by BIND
+ii libdrm2 2.3.0-4 Userspace interface to kernel DRM services -
+ii libdv4 1.0.0-1 software library for DV format digital video
+ii libdvdnav4 0.1.10-0.2 The DVD navigation library
+ii libdvdread3 0.9.7-3 library for reading DVDs
+ii libebook1.2-5 1.6.3-5 Client library for evolution address books
+ii libecal1.2-6 1.6.3-5 Client library for evolution calendars
+ii libedata-book1.2-2 1.6.3-5 Backend library for evolution address books
+ii libedata-cal1.2-5 1.6.3-5 Backend library for evolution calendars
+ii libedataserver1.2-7 1.6.3-5 Utility library for evolution data servers
+ii libedataserverui1.2-6 1.6.3-5 GUI utility library for evolution data serve
+ii libedit2 2.9.cvs.20050518-3 BSD editline and history libraries
+ii libeel2-2.14 2.14.3-5 Eazel Extensions Library (for GNOME2)
+ii libeel2-data 2.14.3-5 Eazel Extensions Library - data files (for G
+ii libegroupwise1.2-10 1.6.3-5 Client library for accessing groupwise POA t
+ii libenchant1c2a 1.3.0-3 a wrapper library for various spell checker
+ii libesd0 0.2.36-3 Enlightened Sound Daemon - Shared libraries
+ii libevent1 1.1a-2 An asynchronous event notification library
+ii libexchange-storage1.2-1 1.6.3-5 Backend library for evolution calendars
+ii libexif12 0.6.15-1 library to parse EXIF files
+ii libexo-0.3-0 0.3.1.12rc2-1 Library with extensions for Xfce
+ii libexpat1 1.95.8-3.4 XML parsing C library - runtime library
+ii libfaac0 1.25-0.1 an AAC audio encoder - library files
+ii libfaad0 2.5-4 freeware Advanced Audio Decoder - runtime fi
+ii libflac7 1.1.2-6 Free Lossless Audio Codec - runtime C librar
+ii libfontconfig1 2.4.2-1.2 generic font configuration library - runtime
+ii libfontenc1 1:1.0.4-2 X11 font encoding library
+ii libfreetype6 2.2.1-6 FreeType 2 font engine, shared library files
+ii libfribidi0 0.10.7-4 Free Implementation of the Unicode BiDi algo
+ii libfs6 2:1.0.0-4 X11 Font Services library
+ii libg2c0 1:3.4.6-5 Runtime library for GNU Fortran 77 applicati
+ii libgail-common 1.8.11-4 GNOME Accessibility Implementation Library -
+ii libgail17 1.8.11-4 GNOME Accessibility Implementation Library -
+ii libgamin0 0.1.8-2 Client library for the gamin file and direct
+ii libgc1c2 1:6.8-1 conservative garbage collector for C and C++
+ii libgcc1 1:4.2-20070528-1 GCC support library
+ii libgcj-bc 4.1.1-21 Link time only library for use with gcj
+ii libgcj-common 1:4.1.1-21 Java runtime library (common files)
+ii libgcj7-0 4.1.1-20 Java runtime library for use with gcj
+ii libgconf2-4 2.18.0.1-3 GNOME configuration database system (shared
+ii libgcrypt11 1.2.4-2 LGPL Crypto library - runtime library
+ii libgda2-3 1.2.3-5+b1 GNOME Data Access library for GNOME2
+ii libgda2-common 1.2.3-5 Common files for GNOME Data Access library f
+ii libgdbm3 1.8.3-3 GNU dbm database routines (runtime version)
+ii libgdl-1-0 0.7.3-1 GNOME DevTool libraries
+ii libgdl-1-common 0.7.3-1 GNOME DevTool libraries - common files
+ii libggi2 1:2.2.1-5 General Graphics Interface runtime libraries
+ii libgii1 1:1.0.1-3 General Input Interface runtime libraries
+ii libgii1-target-x 1:1.0.1-3 General Input Interface X input target
+ii libgimp2.0 2.2.13-1 Libraries necessary to Run the GIMP
+ii libgksu1.2-0 1.3.8-1 library providing su and sudo functionality
+ii libgksu2-0 2.0.3-9 library providing su and sudo functionality
+ii libgksuui1.0-1 1.0.7-2 a graphical fronted to su library
+ii libgl1-mesa-glx 6.5.2-5 A free implementation of the OpenGL API -- G
+ii libglade2-0 1:2.6.0-4 library to load .glade files at runtime
+ii libglib-perl 1:1.144-1 Perl interface to the GLib and GObject libra
+ii libglib2.0-0 2.12.12-1 The GLib library of C routines
+ii libglibmm-2.4-1c2a 2.12.7-1 C++ wrapper for the GLib toolkit (shared lib
+ii libglu1-mesa 6.5.2-5 The OpenGL utility library (GLU)
+ii libgnome-desktop-2 2.18.2-1 Utility library for loading .desktop files -
+ii libgnome-keyring0 0.8.1-2 GNOME keyring services library
+ii libgnome-media0 2.14.2-4 runtime libraries for the GNOME media utilit
+ii libgnome-menu2 2.18.2-1 an implementation of the freedesktop menu sp
+ii libgnome-pilot2 2.0.15-2 Support libraries for gnome-pilot
+ii libgnome-window-settings1 1:2.14.2-7 Utility library for getting window manager s
+ii libgnome2-0 2.18.0-4 The GNOME 2 library - runtime files
+ii libgnome2-canvas-perl 1.002-1+b1 Perl interface to the GNOME canvas library
+ii libgnome2-common 2.18.0-4 The GNOME 2 library - common files
+ii libgnome2-perl 1.040-1 Perl interface to the GNOME libraries
+ii libgnome2-vfs-perl 1.060-1 Perl interface to the 2.x series of the GNOM
+ii libgnomecanvas2-0 2.14.0-2 A powerful object-oriented display - runtime
+ii libgnomecanvas2-common 2.14.0-2 A powerful object-oriented display - common
+ii libgnomecups1.0-1 0.2.2-5 GNOME library for CUPS interaction
+ii libgnomecupsui1.0-1c2a 0.31-3 UI extensions to libgnomecups
+ii libgnomeprint2.2-0 2.18.0-2 The GNOME 2.2 print architecture - runtime f
+ii libgnomeprint2.2-data 2.18.0-2 The GNOME 2.2 print architecture - data file
+ii libgnomeprintui2.2-0 2.18.0-2 GNOME 2.2 print architecture User Interface
+ii libgnomeprintui2.2-common 2.18.0-2 GNOME 2.2 print architecture User Interface
+ii libgnomeui-0 2.18.1-2 The GNOME 2 libraries (User Interface) - run
+ii libgnomeui-common 2.18.1-2 The GNOME 2 libraries (User Interface) - com
+ii libgnomevfs2-0 1:2.18.1-2 GNOME Virtual File System (runtime libraries
+ii libgnomevfs2-bin 1:2.18.1-2 GNOME Virtual File System (support binaries)
+ii libgnomevfs2-common 1:2.18.1-2 GNOME Virtual File System (common files)
+ii libgnomevfs2-extra 1:2.18.1-2 GNOME Virtual File System (extra modules)
+ii libgnutls13 1.6.3-1 the GNU TLS library - runtime library
+ii libgpg-error0 1.4-2 library for common error values and messages
+ii libgphoto2-2 2.3.1-5 gphoto2 digital camera library
+ii libgphoto2-port0 2.3.1-5 gphoto2 digital camera port library
+ii libgpmg1 1.19.6-25 General Purpose Mouse - shared library
+ii libgpod0 0.3.2-1.1 a library to read and write songs and artwor
+ii libgsf-1-114 1.14.3-1 Structured File Library - runtime version
+ii libgsf-1-common 1.14.3-1 Structured File Library - common files
+ii libgsm1 1.0.10-13 Shared libraries for GSM speech compressor
+ii libgssapi2 0.11-1 A mechanism-switch gssapi library
+ii libgstreamer-plugins-base0.10-0 0.10.13-2 GStreamer libraries from the "base" set
+ii libgstreamer0.10-0 0.10.13-1 Core GStreamer libraries and elements
+ii libgtk2-perl 1:1.140-1 Perl interface to the 2.x series of the Gimp
+ii libgtk2.0-0 2.10.12-2 The GTK+ graphical user interface library
+ii libgtk2.0-bin 2.10.12-2 The programs for the GTK+ graphical user int
+ii libgtk2.0-common 2.10.12-2 Common files for the GTK+ graphical user int
+ii libgtkhtml2-0 2.11.0-3 HTML rendering/editing library - runtime fil
+ii libgtkhtml3.8-15 3.12.1-2 HTML rendering/editing library - runtime fil
+ii libgtkmm-2.4-1c2a 1:2.8.8-1 C++ wrappers for GTK+ 2.4 (shared libraries)
+ii libgtksourceview-common 1.8.5-1 common files for the GTK+ syntax highlightin
+ii libgtksourceview1.0-0 1.8.5-1 shared libraries for the GTK+ syntax highlig
+ii libgtkspell0 2.0.10-3+b1 a spell-checking addon for GTK's TextView wi
+ii libgtop2-7 2.14.8-2 gtop system monitoring library
+ii libgtop2-common 2.14.8-2 common files for the gtop system monitoring
+ii libgucharmap4 1:1.6.0-1 Unicode browser widget library (shared libra
+ii libguile-ltdl-1 1.6.8-6 Guile's patched version of libtool's libltdl
+ii libgutenprint2 5.0.0-3 runtime for the Gutenprint printer driver li
+ii libgutenprintui2-1 5.0.0-3 runtime for the Gutenprint printer driver us
+ii libhal-storage1 0.5.9-3 Hardware Abstraction Layer - shared library
+ii libhal1 0.5.9-3 Hardware Abstraction Layer - shared library
+ii libhsqldb-java 1.8.0.7-3 Java SQL database engine
+ii libhunspell-1.1-0 1.1.5-6 spell checker and morphological analyzer (sh
+ii libice6 1:1.0.3-2 X11 Inter-Client Exchange library
+ii libicu36 3.6-2 International Components for Unicode (librar
+ii libid3tag0 0.15.1b-10 ID3 tag reading library from the MAD project
+ii libidl0 0.8.8-0.1 library for parsing CORBA IDL files
+ii libidn11 0.6.5-1 GNU libidn library, implementation of IETF I
+ii libiec61883-0 1.1.0-2 an partial implementation of IEC 61883
+ii libieee1284-3 0.2.10-5 cross-platform library for parallel port acc
+ii libijs-0.35 0.35-3 IJS raster image transport protocol: shared
+ii libimlib2 1.3.0.0debian1-4 powerful image loading and rendering library
+ii libisc11 1:9.3.4-2 ISC Shared Library used by BIND
+ii libisc32 1:9.4.1-1 ISC Shared Library used by BIND
+ii libisccc0 1:9.3.4-2 Command Channel Library used by BIND
+ii libisccc30 1:9.4.1-1 Command Channel Library used by BIND
+ii libisccfg1 1:9.3.4-2 Config File Handling Library used by BIND
+ii libisccfg30 1:9.4.1-1 Config File Handling Library used by BIND
+ii libiw28 28-1 Wireless tools - library
+ii libjack0.100.0-0 0.101.1-2 JACK Audio Connection Kit (libraries)
+ii libjasper-1.701-1 1.701.0-2 The JasPer JPEG-2000 runtime library
+ii libjaxp1.3-java 1.3.03-5 Java XML parser and transformer APIs (DOM, S
+ii libjline-java 0.9.5-2 Java library for handling console input
+ii libjpeg62 6b-13 The Independent JPEG Group's JPEG runtime li
+ii libkeyutils1 1.2-3 Linux Key Management Utilities (library)
+ii libklibc 1.4.34-1 minimal libc subset for use with initramfs
+ii libkpathsea4 3.0-30 path search library for teTeX (runtime part)
+ii libkrb53 1.6.dfsg.1-4 MIT Kerberos runtime libraries
+ii liblame0 3.97-0.0 LAME Ain't an MP3 Encoder
+ii liblcms1 1.15-1 Color management library
+ii libldap2 2.1.30-13.4 OpenLDAP libraries
+ii liblircclient0 0.8.0-9.3 LIRC client library
+ii liblocale-gettext-perl 1.05-1 Using libc functions for internationalizatio
+ii liblockfile1 1.06.1 NFS-safe locking library, includes dotlockfi
+ii libltdl3 1.5.22-4 A system independent dlopen wrapper for GNU
+ii liblua50 5.0.3-2 Main interpreter library for the Lua 5.0 pro
+ii liblualib50 5.0.3-2 Extension library for the Lua 5.0 programmin
+ii liblwres30 1:9.4.1-1 Lightweight Resolver Library used by BIND
+ii liblwres9 1:9.3.4-2 Lightweight Resolver Library used by BIND
+ii liblzo1 1.08-3 data compression library (old version)
+ii liblzo2-2 2.02-2 data compression library
+ii libmad0 0.15.1b-2.1 MPEG audio decoder library
+ii libmagic1 4.20-8 File type determination library using "magic
+ii libmagick9 7:6.2.4.5.dfsg1-0.14 Image manipulation library
+ii libmdbtools 0.5.99.0.6pre1.0.20051109-4 mdbtools libraries
+ii libmetacity0 1:2.14.5-4 library of lightweight GTK2 based Window Man
+ii libmng1 1.0.9-1 Multiple-image Network Graphics library
+ii libmodplug0c2 1:0.7-5.2 shared libraries for mod music based on ModP
+ii libmozjs0d 1.8.0.11-2 The Mozilla SpiderMonkey JavaScript library
+ii libmpcdec3 1.2.2-1 Musepack (MPC) format library
+ii libmpeg2-4 0.4.1-1 MPEG1 and MPEG2 video decoder library
+ii libmusicbrainz4c2a 2.1.5-1 Second generation incarnation of the CD Inde
+ii libmyspell3c2 1:3.1-18 MySpell spellchecking library
+ii libnautilus-burn3 2.14.3-8+b1 Nautilus Burn Library - runtime version
+ii libnautilus-extension1 2.14.3-11+b1 libraries for nautilus components - runtime
+ii libncurses5 5.6-3 Shared libraries for terminal handling
+ii libncursesw5 5.6-3 Shared libraries for terminal handling (wide
+ii libneon25 0.25.5.dfsg-6 An HTTP and WebDAV client library
+ii libneon26 0.26.3-1 An HTTP and WebDAV client library
+ii libnewt0.52 0.52.2-10 Not Erik's Windowing Toolkit - text mode win
+ii libnfsidmap2 0.19-0 An nfs idmapping library
+ii libnl1-pre6 1.0~pre6-5 Library for dealing with netlink sockets
+ii libnm-glib0 0.6.4-7 network management framework (GLib shared li
+ii libnm-util0 0.6.4-7 network management framework (shared library
+ii libnotify1 0.4.4-3 sends desktop notifications to a notificatio
+ii libnspr4-0d 1.8.0.11-2 NetScape Portable Runtime Library
+ii libnss-mdns 0.10-0.1 NSS module for Multicast DNS name resolution
+ii libnss3-0d 1.8.0.11-2 Network Security Service libraries
+ii libogg0 1.1.3-2 Ogg Bitstream Library
+ii liboil0.3 0.3.12-1 Library of Optimized Inner Loops
+ii libopal-2.2.0 2.2.3.dfsg-3 Open Phone Abstraction Library - successor o
+ii libopenal0a 1:0.0.8-4 OpenAL is a portable library for 3D spatiali
+ii libopencdk8 0.5.13-2 Open Crypto Development Kit (OpenCDK) (runti
+ii libopenexr2c2a 1.2.2-4.3 runtime files for the OpenEXR image library
+ii liborbit2 1:2.14.7-0.1 libraries for ORBit2 - a CORBA ORB
+ii libosp5 1.5.2-3 Runtime library for OpenJade group's SP suit
+ii libpam-modules 0.79-4 Pluggable Authentication Modules for PAM
+ii libpam-runtime 0.79-4 Runtime support for the PAM library
+ii libpam0g 0.79-4 Pluggable Authentication Modules library
+ii libpanel-applet2-0 2.14.3-5 library for GNOME 2 panel applets
+ii libpango1.0-0 1.16.4-1 Layout and rendering of internationalized te
+ii libpango1.0-common 1.16.4-1 Modules and...
[truncated message content] |
|
From: <pa...@us...> - 2007-10-17 16:56:38
|
Revision: 2566
http://morphix.svn.sourceforge.net/morphix/?rev=2566&view=rev
Author: paul_c
Date: 2007-10-17 09:56:35 -0700 (Wed, 17 Oct 2007)
Log Message:
-----------
Apply patch from Michael Bunk to correct a problem with not being able to
install local debs.
Also corrects a couple of spelling errors..
Modified Paths:
--------------
trunk/mmaker/debian/mmaker.1
trunk/mmaker/libmorphix/parsemod.c
trunk/mmaker/src/main.c
Modified: trunk/mmaker/debian/mmaker.1
===================================================================
--- trunk/mmaker/debian/mmaker.1 2007-10-13 22:50:11 UTC (rev 2565)
+++ trunk/mmaker/debian/mmaker.1 2007-10-17 16:56:35 UTC (rev 2566)
@@ -67,7 +67,7 @@
.PP
\fI\-v\fR
.RS 4
-Verbose mode \- hepful for debugging.
+Verbose mode \- helpful for debugging.
.RE
.PP
\fI\-i\fR
Modified: trunk/mmaker/libmorphix/parsemod.c
===================================================================
--- trunk/mmaker/libmorphix/parsemod.c 2007-10-13 22:50:11 UTC (rev 2565)
+++ trunk/mmaker/libmorphix/parsemod.c 2007-10-17 16:56:35 UTC (rev 2566)
@@ -345,7 +345,7 @@
parsePatchlist(doc,cur,module);
}
if (!xmlStrcmp(cur->name, ((const xmlChar *)"localdeblist"))) {
- parseCommandlist(doc,cur,module);
+ parseLocalDeblist(doc,cur,module);
}
if (!xmlStrcmp(cur->name, ((const xmlChar *)"commandlist"))) {
parseCommandlist(doc,cur,module);
Modified: trunk/mmaker/src/main.c
===================================================================
--- trunk/mmaker/src/main.c 2007-10-13 22:50:11 UTC (rev 2565)
+++ trunk/mmaker/src/main.c 2007-10-17 16:56:35 UTC (rev 2566)
@@ -178,7 +178,7 @@
}
else {
if (miniroot != NULL && strcmp(module->type,"basemod") == 0) {
- printf("Info: Building miniroot from temporary dxirectory using mkminiroot-morphix\n");
+ printf("Info: Building miniroot from temporary directory using mkminiroot-morphix\n");
if (g_file_test("/usr/sbin/mkminiroot-morphix",G_FILE_TEST_EXISTS) == TRUE) {
printf("Info: mkminiroot-morphix exists\n");
cmdline = g_strdup_printf("/usr/sbin/mkminiroot-morphix %s %s/miniroot-dir %s",module->dirname,getTempRoot(),miniroot);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ale...@us...> - 2008-04-15 21:55:31
|
Revision: 2629
http://morphix.svn.sourceforge.net/morphix/?rev=2629&view=rev
Author: alextreme
Date: 2008-04-15 14:55:24 -0700 (Tue, 15 Apr 2008)
Log Message:
-----------
* fixed -s option for mmaker, added -s to isomaker (retrieve source packages after a module has been built, for all packages present in a module)
Modified Paths:
--------------
trunk/mmaker/debian/changelog
trunk/mmaker/libmorphix/makemodule.c
trunk/mmaker/libmorphix/makemodule.h
trunk/mmaker/src/isomaker.c
Modified: trunk/mmaker/debian/changelog
===================================================================
--- trunk/mmaker/debian/changelog 2008-04-15 16:09:46 UTC (rev 2628)
+++ trunk/mmaker/debian/changelog 2008-04-15 21:55:24 UTC (rev 2629)
@@ -1,3 +1,9 @@
+morphix-mmaker (0.4-44) unstable; urgency=low
+
+ * Fixes for -s (source retrieval option), added to isomaker. Confirmed it might actually work this time!
+
+ -- Alex de Landgraaf <al...@de...> Tue, 15 Apr 2008 18:57:24 +0200
+
morphix-mmaker (0.4-43) unstable; urgency=low
* Bug fix from Michael Bunk to correctly parse localdeb option.
Modified: trunk/mmaker/libmorphix/makemodule.c
===================================================================
--- trunk/mmaker/libmorphix/makemodule.c 2008-04-15 16:09:46 UTC (rev 2628)
+++ trunk/mmaker/libmorphix/makemodule.c 2008-04-15 21:55:24 UTC (rev 2629)
@@ -875,56 +875,7 @@
return TRUE;
}
-/**
- Compresses the directory using the default cloop compression
- @param dirname gchar*; Directory to compress
- @param filename gchar *; resulting compressed image
-
- return TRUE if successful, FALSE and message to stderr if an error occurred
-*/
-
-gboolean compressModuleCloop(gchar *dirname, gchar *filename) {
- int ret;
- gchar *cmdline;
- gchar *tmpisofile;
- gboolean exists = FALSE;
- if (!g_file_test(P_CREATE_COMPRESSED_FS,G_FILE_TEST_EXISTS)) {
- fprintf(stderr,"Error: couldn't locale create_compressed_fs on %s",P_CREATE_COMPRESSED_FS);
- return FALSE;
- }
- tmpisofile = g_strdup_printf("%s/%s",getTempRoot(),"libmorphix-tmpiso-XXXXXX");
- ret = mkstemp(tmpisofile);
- cmdline = g_strdup_printf("%s -R -U -m /proc/* -o %s -hide-rr-moved -cache-inodes -no-bak -pad %s",P_MKISOFS,tmpisofile,dirname);
- if (ExecuteCommand(cmdline) == TRUE) {
- g_free(cmdline);
- // nice -5 create_compressed_fs file.iso 65536 > output.mod
- cmdline = g_strdup_printf("/bin/sh -c \"%s -5 %s %s 65536 > %s\"",P_NICE,P_CREATE_COMPRESSED_FS,tmpisofile,filename);
- if (!ExecuteCommand(cmdline)) {
- fprintf(stderr,"Error: unable to compress temporary iso file: %s\n",tmpisofile);
- }
- else {
- unlink(tmpisofile);
- }
- g_free(cmdline);
- }
- else {
- fprintf(stderr,"Error: unable to build temporary iso file from directory %s\n",dirname);
- g_free(cmdline);
- }
-
- fprintf(stderr,"Info: Compression complete\n");
- exists = g_file_test(filename,G_FILE_TEST_EXISTS);
- if (exists == TRUE) {
- fprintf(stderr,"Info: Compression successful\n");
- }
- else {
- fprintf(stderr,"Info: Compression failed\n");
- }
- g_free(tmpisofile);
- return exists;
-}
-
/**
Fires up apt-get, after optionally making debconf non-interactive
optionally executes depmod afterwards. Uses the module->interactive setting
@@ -960,8 +911,6 @@
installPackages(module,module->dirname);
- deletePackages(module,module->dirname);
-
if (extra_package_list != NULL) {
GList * ptr = extra_package_list;
@@ -997,6 +946,7 @@
return FALSE;
}
+ deletePackages(module,module->dirname);
deleteCruft(module->dirname);
if (!cleanApt(module,module->dirname)) {
@@ -1230,6 +1180,12 @@
gint count = 5; // skip first 5 lines of dpkg -l
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);
+
if (sources_location == NULL) { // no sources wanted
return TRUE;
}
@@ -1248,8 +1204,7 @@
simply isn't enough...
*/
- cmdline = g_strdup_printf("%s %s sh -c \"COLUMNS=160 dpkg -l | gzip > /morphix/packages.gz\"",P_CHROOT,module->dirname);
-
+ cmdline = g_strdup_printf("%s %s sh -c \"COLUMNS=160 dpkg -l\"",P_CHROOT,module->dirname);
stdinput = ExecuteCommandReturnStdin(cmdline);
g_free(cmdline);
buf_array = g_strsplit(stdinput,"\n",0);
@@ -1278,8 +1233,7 @@
g_free(cmdline);
cmdline = g_strdup_printf("rm -rf %s/sources", module->dirname);
- // Enable this after everything works...
- // ExecuteCommand(cmdline);
+ ExecuteCommand(cmdline);
g_free(cmdline);
return TRUE;
Modified: trunk/mmaker/libmorphix/makemodule.h
===================================================================
--- trunk/mmaker/libmorphix/makemodule.h 2008-04-15 16:09:46 UTC (rev 2628)
+++ trunk/mmaker/libmorphix/makemodule.h 2008-04-15 21:55:24 UTC (rev 2629)
@@ -27,7 +27,6 @@
gboolean updatePackages(mmodule *module, gchar *dirname);
gboolean installPackages(mmodule *module, gchar *dirname);
gboolean cleanApt(mmodule *module, gchar *dirname);
-gboolean compressModuleCloop(gchar *dirname, gchar *filename);
gboolean executePatches(mmodule *module, gchar *dirname);
gboolean addRepositories(mmodule *module,gchar *dirname);
gboolean setupDebootstrap(mmodule *module);
Modified: trunk/mmaker/src/isomaker.c
===================================================================
--- trunk/mmaker/src/isomaker.c 2008-04-15 16:09:46 UTC (rev 2628)
+++ trunk/mmaker/src/isomaker.c 2008-04-15 21:55:24 UTC (rev 2629)
@@ -31,17 +31,18 @@
#define MAKEISO_PATH "/usr/bin/make-iso"
void usage(gchar *filename) {
- printf("Usage: %s -b basemod.xml [-g debootstrap.tar.gz] [-t tarball.tar.gz] [-m mainmod.xml] [-m mainmod2.xml] [-n minimod1.xml] [-n minimod2.xml] [-c] [-v] [-r repository [-p package1] [-p package2]] [-R image.png] output.iso\n",filename);
+ printf("Usage: %s -b basemod.xml [-g debootstrap.tar.gz] [-t tarball.tar.gz] [-m mainmod.xml] [-m mainmod2.xml] [-n minimod1.xml] [-n minimod2.xml] [-c] [-v] [-r repository [-p package1] [-p package2]] [-R image.png] [-s /path/to/sources.gz] output.iso\n",filename);
printf("\t-b:\tBase module template to build output.iso with\n");
+ printf("\t-c:\tClean temporary directories\n");
+ printf("\t-g:\tTarball which contains a complete debootstrapped Debian\n\t\tsystem for building the base module (and any main modules)\n");
printf("\t-m:\tMain module template to include in output.iso\n");
printf("\t-n:\tMini module template to include in output.iso (needs morphmini)\n");
+ printf("\t-p:\tPackages to be included on iso\n");
printf("\t-r:\tSpecify Repository for deb/udeb packages to include on iso\n");
- printf("\t-p:\tPackages to be included on iso\n");
+ printf("\t-R:\tCall morphix-rebrand on the resulting iso using this image-file\n");
+ printf("\t-s:\tDownload and store all source packages in this tarball\n");
printf("\t-t:\tTarball to be included on iso\n");
- printf("\t-g:\tTarball which contains a complete debootstrapped Debian\n\t\tsystem for building the base module (and any main modules)\n");
- printf("\t-c:\tClean temporary directories\n");
- printf("\t-R:\tCall morphix-rebrand on the resulting iso using this image-file\n");
printf("\t-v:\tverbose mode\n");
printf("\nThis tool uses mmaker to generate a Morphix iso from scratch,\n");
printf("using one basemodule template, and arbitrary number of mainmodule and minimodule templates,\nand optionally extra dpkg-deb-extracted deb/udeb packages\n\n");
@@ -79,16 +80,23 @@
}
}
-void do_mainmodules(gchar *workdir, GList *mainmodxmllist,gchar *debtarball) {
+void do_mainmodules(gchar *workdir, GList *mainmodxmllist,gchar *debtarball, gchar *source_directory) {
gint count = 0;
GList *ptr = NULL;
gchar *cmdline = NULL;
ptr = mainmodxmllist;
while (ptr != NULL) {
gchar *xmltemplate = (gchar *)ptr->data;
+ gchar *mmaker_sourcefile = NULL;
count++;
- cmdline = g_strdup_printf("%s -c %s %s %s/mainmod/%s.mod",
+
+ if (source_directory != NULL) {
+ mmaker_sourcefile = g_strdup_printf(" -s %s/main-%s-%d.tar.gz", source_directory, xmltemplate, count);
+ }
+
+ cmdline = g_strdup_printf("%s %s -c %s %s %s/mainmod/%s.mod",
MMAKER_PATH,
+ (source_directory ? mmaker_sourcefile : ""),
debtarball,
xmltemplate,
workdir,
@@ -97,6 +105,10 @@
printf("Warning: mmaker returned an error when building mainmodule, continuing...\n");
}
g_free(cmdline);
+ if (mmaker_sourcefile != NULL) {
+ g_free(mmaker_sourcefile);
+ mmaker_sourcefile = NULL;
+ }
ptr = ptr->next;
}
}
@@ -209,6 +221,10 @@
gchar *debtarball = NULL;
gchar *morphixrebrand = NULL;
+ gchar *retrieve_source = NULL;
+ gchar *source_directory = NULL;
+ gchar *mmaker_sourcefile = NULL;
+
GList *mainmodxmllist = NULL;
GList *minimodxmllist = NULL;
GList *packagelist = NULL;
@@ -225,7 +241,7 @@
return(EXIT_FAILURE);
}
- while ((optchar = getopt(argc,argv,"b:m:n:r:g:t:p:R:cv")) != -1) {
+ while ((optchar = getopt(argc,argv,"b:m:n:r:g:s:t:p:R:cv")) != -1) {
switch (optchar) {
case 'b':
// set temporary directory
@@ -276,6 +292,10 @@
opts+=1;
verbose = TRUE;
break;
+ case 's':
+ opts+=2;
+ retrieve_source = (char *) g_strdup(optarg);
+ break;
case '?':
printf("Error: Unknown command line option...\n");
usage(argv[0]);
@@ -343,6 +363,15 @@
use_debget = FALSE;
}
+ if (retrieve_source != NULL) {
+ source_directory = getTempdir();
+ if (source_directory == NULL) {
+ printf("Error: Unable to create temporary directory in %s for storing the source packages...\n",getTempRoot());
+ return(EXIT_FAILURE);
+ }
+ mmaker_sourcefile = g_strdup_printf(" -s %s/base.tar.gz ", source_directory);
+ }
+
/* everything should be okay now, start making that iso */
/* set up default directories */
@@ -355,9 +384,10 @@
/* build and add basemodule files */
- cmdline = g_strdup_printf("%s%s -t %s -m %s/boot/miniroot.gz -k %s/boot/vmlinuz %s %s %s/base/morphix",
+ cmdline = g_strdup_printf("%s%s %s -t %s -m %s/boot/miniroot.gz -k %s/boot/vmlinuz %s %s %s/base/morphix",
MMAKER_PATH,
- (verbose ? " -v" : ""),
+ (verbose ? " -v" : ""),
+ (retrieve_source ? mmaker_sourcefile : ""),
tempdir,
workdir,
workdir,
@@ -372,7 +402,7 @@
/* build and add mainmodules */
- do_mainmodules(workdir,mainmodxmllist,debtarball);
+ do_mainmodules(workdir,mainmodxmllist,debtarball, source_directory);
/* build and add minimodules */
@@ -415,6 +445,18 @@
printf("Info: Your live CD should be available as %s\n",outputiso);
+ /* Bundle all the source tarballs into a single tarball */
+
+ if (retrieve_source != NULL) {
+ cmdline = g_strdup_printf("tar zcvf %s %s", retrieve_source,source_directory);
+ ExecuteCommand(cmdline);
+ g_free(cmdline);
+
+ cmdline = g_strdup_printf("rm -rf %s", source_directory);
+ ExecuteCommand(cmdline);
+ g_free(cmdline);
+ }
+
/* clean everything up... */
if(clean){
printf("Info: Cleaning up base module build directory %s\n",tempdir);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X