Menu
▾
▴
[Morphix-cvs] SF.net SVN: morphix: [2494] trunk/mmaker
|
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.
|
