This email list is read-only. Emails sent to this list will be discarded
----------------------------------
Makefile.am | 5 +-
configure.ac | 10 ++-
debian/changelog | 18 +++++-
default_config/defaults.cfg | 61 ++++++++++-------
libs/InstallImage.py | 29 ++++----
libs/Project.py | 3 +
libs/SDK.py | 4 -
platforms/Makefile.am | 6 +-
platforms/common-apt/initramfs/cd | 2 +-
platforms/common-apt/initramfs/disk | 2 +-
platforms/common-apt/initramfs/nand | 2 +-
platforms/common-apt/initramfs/usb | 2 +-
platforms/common-yum/initramfs/disk | 4 +-
platforms/common-yum/initramfs/usb | 2 +-
.../Makefile.am | 7 +-
.../mccaslin-lpia-ubuntu-hardy-ppa/Makefile.am | 7 +-
.../mccaslin-lpia-ubuntu-hardy-ppa/fsets/base.fset | 6 +-
platforms/mccaslin-lpia-ubuntu-hardy/Makefile.am | 7 +-
.../mccaslin-lpia-ubuntu-hardy/fsets/base.fset | 4 +-
platforms/mccaslin-lpia-ume/Makefile.am | 35 ++++++++++
platforms/mccaslin-lpia-ume/fsets/base.fset | 58 ++++++++++++++++
.../mccaslin-lpia-ume/initramfs/initramfs.conf | 54 +++++++++++++++
platforms/mccaslin-lpia-ume/initramfs/modules | 22 ++++++
platforms/mccaslin-lpia-ume/initramfs/usplash.conf | 3 +
platforms/mccaslin-lpia-ume/sources/hardy.list | 1 +
platforms/mccaslin-lpia-ume/sources/ume.list | 8 ++
platforms/mccaslin-lpia/Makefile.am | 7 +-
.../Makefile.am | 71 ++++++++++----------
.../Makefile.am | 7 +-
platforms/menlow-lpia-ubuntu-hardy-ppa/Makefile.am | 7 +-
.../menlow-lpia-ubuntu-hardy-ppa/fsets/base.fset | 6 +-
platforms/menlow-lpia-ubuntu-hardy/Makefile.am | 7 +-
platforms/menlow-lpia-ubuntu-hardy/fsets/base.fset | 4 +-
platforms/menlow-lpia-ume/Makefile.am | 35 ++++++++++
platforms/menlow-lpia-ume/fsets/base.fset | 53 +++++++++++++++
platforms/menlow-lpia-ume/initramfs/initramfs.conf | 54 +++++++++++++++
platforms/menlow-lpia-ume/initramfs/modules | 24 +++++++
platforms/menlow-lpia-ume/initramfs/usplash.conf | 3 +
platforms/menlow-lpia-ume/sources/hardy.list | 1 +
platforms/menlow-lpia-ume/sources/ume.list | 8 ++
platforms/menlow-lpia/Makefile.am | 7 +-
platforms/platforms.cfg | 39 +++++++----
42 files changed, 549 insertions(+), 146 deletions(-)
New commits:
commit 7a04f0e9701c130b7081d501842ab6cadd2576f4
Author: Mitsutaka Amano <[EMAIL PROTECTED]>
Date: Fri Aug 22 19:05:53 2008 +0900
* Merged from UME patches. Based patch file is
moblin-image-creator-0.44+repack/debian/patches/74_boot-is-really-boot.patch.
Thanks to Loic Minier <[EMAIL PROTECTED]>.
commit 7204c159e2d37f726225ada024f5b4a7bd9a8b12
Author: Mitsutaka Amano <[EMAIL PROTECTED]>
Date: Fri Aug 22 18:38:25 2008 +0900
* Merged from UME patches. Based patch file is
moblin-image-creator-0.44+repack/debian/patches/73_create-kernel-img-conf.patch.
Thanks to Loic Minier <[EMAIL PROTECTED]>.
commit 088db7949bce18c6cca48afed73656effa54969a
Author: Mitsutaka Amano <[EMAIL PROTECTED]>
Date: Fri Aug 22 18:35:32 2008 +0900
* Fixed some Makefile.am to entried .empty file. It can correspond only
Makefile.am. so Removed a .empty file.
commit 2dd415be360a0b2d9960a5bb44fd40533ec09f40
Author: Mitsutaka Amano <[EMAIL PROTECTED]>
Date: Fri Aug 22 15:52:44 2008 +0900
* Merged from UME patches. Based patch file is
moblin-image-creator-0.44+repack/debian/patches/72_ume-platforms.patch. Thanks
to Loic Minier <[EMAIL PROTECTED]>.
* Sorted some make entry.
* Cleared dirty codes.
* Added nand and nand.sh entries in using common-apt platforms.
commit 22adc3ffcd2b0c4925afc33b03628839872cd604
Author: Mitsutaka Amano <[EMAIL PROTECTED]>
Date: Fri Aug 22 14:45:20 2008 +0900
* Merged from UME patches. Based patch file is
moblin-image-creator-0.44+repa
ck/debian/patches/71_install_locale.patch. Thanks to Loic Minier <[EMAIL
PROTECTED]>
.
commit 8a264ef96019a2fbba42b331178c730b4d138154
Author: Mitsutaka Amano <[EMAIL PROTECTED]>
Date: Fri Aug 22 14:41:59 2008 +0900
* Merged from UME patches. Based patch file is
moblin-image-creator-0.44+repa
ck/debian/patches/70_menu-lst-default.patch. Thanks to Loic Minier <[EMAIL
PROTECTED]
g>.
More information is the following.
==========
From 31f1880582c88a5520726c30e5468ac78d50e144 Mon Sep 17 00:00:00 2001
From: =?utf-8?q?Lo=C3=AFc=20Minier?= <[EMAIL PROTECTED]>
Date: Fri, 30 May 2008 01:08:37 +0200
Subject: [PATCH] Don't sed the "default" line in menu.lst
---
libs/InstallImage.py | 11 -----------
1 files changed, 0 insertions(+), 11 deletions(-)
commit a98b8b6f6a348446460f2ced7c5f919e81870612
Author: Mitsutaka Amano <[EMAIL PROTECTED]>
Date: Fri Aug 22 14:36:55 2008 +0900
* Merged from UME patches. Based patch file is
moblin-image-creator-0.44+repack/debian/patches/69_run-update-grub.patch.
Thanks to Loic Minier <[EMAIL PROTECTED]>.
* Removed unnecessary comments.
More information is the following.
==========
From 67f37a3adedbdc6065fb16dc1e5f145aac62c938 Mon Sep 17 00:00:00 2001
From: =?utf-8?q?Lo=C3=AFc=20Minier?= <[EMAIL PROTECTED]>
Date: Fri, 30 May 2008 01:07:45 +0200
Subject: [PATCH] "update-grub" instead of sedding "kernel" lines
* Run update-grub after setting kopt in AUTOMAGIC KERNELS LIST; fixes
the kernel entries to use the proper options by default
* Move the /boot -> / fixup after the second update-grub
commit c8baec727bfbb299f0c3cad3ae6e9743debc3b67
Author: Mitsutaka Amano <[EMAIL PROTECTED]>
Date: Fri Aug 22 14:28:46 2008 +0900
* Merged from UME patches. Based patch file is
moblin-image-creator-0.44+repack/debian/patches/68_clean-default-kopts.patch.
Thanks to Loic Minier <[EMAIL PROTECTED]>.
More information is the following.
==========
From 1742fe3413141391e1f546567591715e1cec4f04 Mon Sep 17 00:00:00 2001
From: =?utf-8?q?Lo=C3=AFc=20Minier?= <[EMAIL PROTECTED]>
Date: Fri, 30 May 2008 00:41:05 +0200
Subject: [PATCH] Drop splash quiet from hd_kernel_cmdline in *.cfg
Drop splash quiet from the hd_kernel_cmdline options in all *.cfg files
as these will be appended by the default grub config.
---
default_config/defaults.cfg | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 deletions(-)
* Cleaned dirty comments.
commit f23e967dd434154b8887bd767891d096ca2d1545
Author: Mitsutaka Amano <[EMAIL PROTECTED]>
Date: Fri Aug 22 14:07:27 2008 +0900
* Merged from UME patches. Based patch file is
moblin-image-creator-0.44+repack/debian/patches/66_mount-boot.patch. Thanks to
Loic Minier <[EMAIL PROTECTED]>.
More information is the following.
==========
From 0f5695a77e807812b40f47adc7eaaf2b0f081b9c Mon Sep 17 00:00:00 2001
From: =?utf-8?q?Lo=C3=AFc=20Minier?= <[EMAIL PROTECTED]>
Date: Tue, 27 May 2008 19:15:44 +0200
Subject: [PATCH] Make sure /boot is mounted and rw for squashfs
---
platforms/common-apt/initramfs/disk | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
* Resync initscripts both of apt and yum. Normally we don't use
'#!/bin/bash'.
commit 1347869582e368f19907970f9cdc878b5bf83d69
Author: Mitsutaka Amano <[EMAIL PROTECTED]>
Date: Fri Aug 22 12:37:51 2008 +0900
* Merged from UME patches. Based patch file is
moblin-image-creator-0.44+repack/debian/patches/61_skip-usr-share-projects.patch.
Thanks to Loic Minier <[EMAIL PROTECTED]>.
* It was already implemented. so It deleted only FIXME comments.
More information is the following.
==========
From ce8d88bed57348644330b5c4d691812d30caba6d Mon Sep 17 00:00:00 2001
From: =?utf-8?q?Lo=C3=AFc=20Minier?= <[EMAIL PROTECTED]>
Date: Tue, 20 May 2008 22:14:13 +0200
Subject: [PATCH] Only scan for projects file in the compat dir if it exists
---
libs/SDK.py | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
commit 6abe43a9b28fa0ed80ab61a60c742b087cecf91a
Author: Mitsutaka Amano <[EMAIL PROTECTED]>
Date: Fri Aug 22 12:32:55 2008 +0900
* Merged from UME patches. Based patch file is
moblin-image-creator-0.44+repack/debian/patches/60_var-lib-projects.patch.
Thanks to Loic Minier <[EMAIL PROTECTED]>.
More information is the following.
==========
From 972be89652d2098ead24b501ee3acd7333910102 Mon Sep 17 00:00:00 2001
From: =?utf-8?q?Lo=C3=AFc=20Minier?= <[EMAIL PROTECTED]>
Date: Tue, 20 May 2008 21:02:00 +0200
Subject: [PATCH] Create /projects in /var at install rather than runtime;
LP: #232301
Directories used at runtime should be created by the installation scripts
and
directories looked up for backward compatibility should simply already be
there. This drops the creation of the backward compatibility dir and
creates
the projects dir in install.
---
Makefile | 2 +-
libs/SDK.py | 2 --
2 files changed, 1 insertions(+), 3 deletions(-)
commit c27a3a6a8d0fd558d59ef7b0bd8841877346f5c4
Author: Mitsutaka Amano <[EMAIL PROTECTED]>
Date: Fri Aug 22 12:31:01 2008 +0900
* Merged from UME patches. Based patch file is
moblin-image-creator-0.44+repack/debian/patches/40_fsets.patch. Thanks to Loic
Minier <[EMAIL PROTECTED]>.
Diff in this email is a maximum of 400 lines.
diff --git a/.empty b/.empty
deleted file mode 100644
index e69de29..0000000
diff --git a/Makefile.am b/Makefile.am
index 73cdf13..46a00d2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -12,9 +12,8 @@ extradir = ${pkgdatadir}
extra_DATA = \
COPYING
-vardir = ${localstatedir}/lib/moblin-image-creator
-var_DATA = \
- .empty
+vardir = ${localstatedir}/lib/moblin-image-creator/projects
+var_DATA =
desktopdir = ${datadir}/applications
Desktop_Files = image-creator.desktop.in
diff --git a/configure.ac b/configure.ac
index 99c3ff8..a8fe3cb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -38,16 +38,18 @@ AC_CONFIG_FILES([Makefile po/Makefile.in
libs/Makefile
utils/Makefile
platforms/Makefile
+ platforms/mccaslin-lpia/Makefile
platforms/mccaslin-lpia-fedora/Makefile
platforms/mccaslin-lpia-ubuntu-hardy-ppa-snapshot/Makefile
platforms/mccaslin-lpia-ubuntu-hardy-ppa/Makefile
platforms/mccaslin-lpia-ubuntu-hardy/Makefile
- platforms/mccaslin-lpia/Makefile
+ platforms/mccaslin-lpia-ume/Makefile
+ platforms/menlow-lpia/Makefile
+ platforms/menlow-lpia-moblin2/Makefile
platforms/menlow-lpia-ubuntu-hardy-jax10-snapshot1/Makefile
platforms/menlow-lpia-ubuntu-hardy-ppa-snapshot/Makefile
platforms/menlow-lpia-ubuntu-hardy-ppa/Makefile
platforms/menlow-lpia-ubuntu-hardy/Makefile
- platforms/menlow-lpia/Makefile
- platforms/menlow-lpia-moblin2/Makefile
- platforms/netbook-lpia-moblin2/Makefile])
+ platforms/menlow-lpia-ume/Makefile
+ platforms/netbook-lpia-moblin2/Makefile])
AC_OUTPUT
diff --git a/debian/changelog b/debian/changelog
index a1f4db7..8595bb2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -125,9 +125,23 @@ moblin-image-creator (0.45) UNRELEASED; urgency=low
* Adding ability to execute post install scripts
* Fixing Jax10 platform
* Using squashfs for Jax10 platform
- * Reducing boot partition size for netbook
+ * Reducing boot partition size for netbook
- -- Prajwal Mohan <[EMAIL PROTECTED]> Thu, 21 Aug 2008 17:27:45 -0700
+ [ Mitsutaka Amano ]
+ * Merged from UME patches. Based patch file is
moblin-image-creator-0.44+repack/debian/patches/40_fsets.patch. Thanks to Loic
Minier <[EMAIL PROTECTED]>.
+ * Merged from UME patches. Based patch file is
moblin-image-creator-0.44+repack/debian/patches/60_var-lib-projects.patch.
Thanks to Loic Minier <[EMAIL PROTECTED]>.
+ * Merged from UME patches. Based patch file is
moblin-image-creator-0.44+repack/debian/patches/61_skip-usr-share-projects.patch.
Thanks to Loic Minier <[EMAIL PROTECTED]>.
+ * Merged from UME patches. Based patch file is
moblin-image-creator-0.44+repack/debian/patches/66_mount-boot.patch. Thanks to
Loic Minier <[EMAIL PROTECTED]>.
+ * Merged from UME patches. Based patch file is
moblin-image-creator-0.44+repack/debian/patches/68_clean-default-kopts.patch.
Thanks to Loic Minier <[EMAIL PROTECTED]>.
+ * Merged from UME patches. Based patch file is
moblin-image-creator-0.44+repack/debian/patches/69_run-update-grub.patch.
Thanks to Loic Minier <[EMAIL PROTECTED]>.
+ * Merged from UME patches. Based patch file is
moblin-image-creator-0.44+repack/debian/patches/70_menu-lst-default.patch.
Thanks to Loic Minier <[EMAIL PROTECTED]>.
+ * Merged from UME patches. Based patch file is
moblin-image-creator-0.44+repack/debian/patches/71_install_locale.patch. Thanks
to Loic Minier <[EMAIL PROTECTED]>.
+ * Merged from UME patches. Based patch file is
moblin-image-creator-0.44+repack/debian/patches/72_ume-platforms.patch. Thanks
to Loic Minier <[EMAIL PROTECTED]>.
+ * Fixed some Makefile.am to entried .empty file. It can correspond only
Makefile.am. so Removed a .empty file.
+ * Merged from UME patches. Based patch file is
moblin-image-creator-0.44+repack/debian/patches/73_create-kernel-img-conf.patch.
Thanks to Loic Minier <[EMAIL PROTECTED]>.
+ * Merged from UME patches. Based patch file is
moblin-image-creator-0.44+repack/debian/patches/74_boot-is-really-boot.patch.
Thanks to Loic Minier <[EMAIL PROTECTED]>.
+
+ -- Mitsutaka Amano <[EMAIL PROTECTED]> Fri, 22 Aug 2008 19:05:15 +0900
moblin-image-creator (0.44) gaston; urgency=low
diff --git a/default_config/defaults.cfg b/default_config/defaults.cfg
index 9e89b5d..a6db587 100644
--- a/default_config/defaults.cfg
+++ b/default_config/defaults.cfg
@@ -10,7 +10,7 @@
# configuration information as it has parsed it.
-# ********* General section **********
+# ********** General section **********
[general]
debug = 0
@@ -20,7 +20,7 @@ verbose_project_tar = 0
# Use rootstraps, 1 = use rootstraps, 0 = do NOT use rootstraps.
use_rootstraps = 1
-# ********* Platform section **********
+# ********** Platform section **********
# If you want to have configuration date for a specific platform, then you can
# specify a section name in the form of [platform.platform_name]. Otherwise
# the [platform] section will be used by default for any platform.
@@ -31,7 +31,6 @@ use_rootstraps = 1
# delete your current rootstraps for it to take affect. This command will do
# that: image-creator --command clear-rootstraps
[platform]
-
# mirror to use for platform (aka buildroot) rootstrap configuration
buildroot_mirror = http://ports.ubuntu.com/ubuntu-ports/
# codename to use for platform rootstrap configuration
@@ -47,7 +46,7 @@ buildroot_extras = squashfs-tools dosfstools syslinux
module-init-tools mtools g
buildroot_packages = initramfs-tools debhelper devscripts liburi-perl
kernel-package dpatch grub libncursesw5-dev libncurses5-dev man less vim
apt-utils libgtk2.0-dev ssh automake autotools-dev build-essential
gtk-doc-tools dh-make hildon-desktop libhildon-1-dev libhildonfm2-dev
hildon-desktop-dev
# Options for the kernel that will be booted from the hard drive on the device
-hd_kernel_cmdline = ro boot=disk resume=/dev/sda3 splash quiet
+hd_kernel_cmdline = ro boot=disk resume=/dev/sda3
# Options for the kernel that will be booted from the USB flash drive
usb_kernel_cmdline = initrd=initrd.img boot=usb
@@ -61,66 +60,72 @@ nand_kernel_cmdline = ro no-hlt boot=nand single
console=ttyMS0 earlyprintk=seri
# Architecture to use for creating the rootstraps
architecture=lpia
-
-#*********** Ubuntu Platforms *************************
+# ********** Ubuntu Platforms **********
# ********** Special stuff unique to McCaslin **********
[platform.mccaslin-lpia]
-hd_kernel_cmdline = ro boot=disk resume=/dev/sda3 nolapic_timer splash quiet
+hd_kernel_cmdline = ro boot=disk resume=/dev/sda3 nolapic_timer
[platform.mccaslin-lpia-ubuntu-gutsy-ppa]
-hd_kernel_cmdline = ro boot=disk resume=/dev/sda3 nolapic_timer splash quiet
+hd_kernel_cmdline = ro boot=disk resume=/dev/sda3 nolapic_timer
# ********** Special stuff unique to McCaslin **********
[platform.mccaslin-lpia-ubuntu-hardy]
-hd_kernel_cmdline = ro boot=disk resume=/dev/sda3 nolapic_timer splash quiet
+hd_kernel_cmdline = ro boot=disk resume=/dev/sda3 nolapic_timer
# codename to use for platform rootstrap configuration
buildroot_codename = hardy
# ********** Special stuff unique to McCaslin **********
[platform.mccaslin-lpia-ubuntu-hardy-ppa]
-hd_kernel_cmdline = ro boot=disk resume=/dev/sda3 nolapic_timer splash quiet
+hd_kernel_cmdline = ro boot=disk resume=/dev/sda3 nolapic_timer
# codename to use for platform rootstrap configuration
buildroot_codename = hardy
[platform.mccaslin-lpia-ubuntu-hardy-ppa-snapshot]
-hd_kernel_cmdline = ro boot=disk resume=/dev/sda3 nolapic_timer splash quiet
+hd_kernel_cmdline = ro boot=disk resume=/dev/sda3 nolapic_timer
# codename to use for platform rootstrap configuration
buildroot_codename = hardy
# Going to use the snapshot for the PPA platform
buildroot_mirror = http://snapshot.ubuntu.com/lpia/snapshot/2008-02-27/ports/
+[platform.mccaslin-lpia-ume]
+hd_kernel_cmdline = ro boot=disk resume=/dev/sda3 nolapic_timer
+buildroot_codename = hardy
+
# ********** Special stuff unique to Menlow **********
[platform.menlow-lpia]
-hd_kernel_cmdline = ro boot=disk resume=/dev/sda3 splash quiet ht=on
+hd_kernel_cmdline = ro boot=disk resume=/dev/sda3 ht=on
[platform.menlow-lpia-ubuntu-gutsy-ppa]
-hd_kernel_cmdline = ro boot=disk resume=/dev/sda3 splash quiet ht=on
+hd_kernel_cmdline = ro boot=disk resume=/dev/sda3 ht=on
[platform.menlow-lpia-ubuntu-hardy]
# codename to use for platform rootstrap configuration
-hd_kernel_cmdline = ro boot=disk resume=/dev/sda3 splash quiet ht=on
+hd_kernel_cmdline = ro boot=disk resume=/dev/sda3 ht=on
buildroot_codename = hardy
[platform.menlow-lpia-ubuntu-hardy-ppa]
# codename to use for platform rootstrap configuration
-hd_kernel_cmdline = ro boot=disk resume=/dev/sda3 splash quiet ht=on
+hd_kernel_cmdline = ro boot=disk resume=/dev/sda3 ht=on
buildroot_codename = hardy
[platform.menlow-lpia-ubuntu-hardy-ppa-snapshot]
# codename to use for platform rootstrap configuration
-hd_kernel_cmdline = ro boot=disk resume=/dev/sda3 splash quiet ht=on
+hd_kernel_cmdline = ro boot=disk resume=/dev/sda3 ht=on
buildroot_codename = hardy
# Going to use the snapshot for the PPA platform
buildroot_mirror = http://snapshot.ubuntu.com/lpia/snapshot/2008-02-27/ports/
-[platform.menlow-lpia-ubuntu-hardy-jax10-snapshot1]
-# codename to use for platform rootstrap configuration
-hd_kernel_cmdline = ro boot=disk resume=/dev/sda3 ht=on
-buildroot_codename = hardy
+[platform.menlow-lpia-ume]
+hd_kernel_cmdline = ro boot=disk resume=/dev/sda3 ht=on
+buildroot_codename = hardy
+[platform.menlow-lpia-ubuntu-hardy-jax10-snapshot1]
+# codename to use for platform rootstrap configuration
+hd_kernel_cmdline = ro boot=disk resume=/dev/sda3 ht=on
+buildroot_codename = hardy
-# ***************** Fedora Platforms *****************************
+# ********** Fedora Platforms **********
[platform.mccaslin-lpia-fedora]
# What additional packages need to be installed in the buildroot roostrap
buildroot_extras = squashfs-tools dosfstools syslinux module-init-tools mtools
busybox
@@ -128,6 +133,7 @@ buildroot_extras = squashfs-tools dosfstools syslinux
module-init-tools mtools b
# What packages need to be installed in the buildroot (outside the rootstrap
archive)
buildroot_packages = grub man less vim automake autotools-dev openssh-clients
+# ********** Moblin 2.0 Platforms **********
[platform.netbook-lpia-moblin2]
# What additional packages need to be installed in the buildroot roostrap
buildroot_extras = squashfs-tools dosfstools syslinux module-init-tools mtools
busybox setup
@@ -144,7 +150,7 @@ buildroot_extras = squashfs-tools dosfstools syslinux
module-init-tools mtools b
#buildroot_packages = grub man less vim automake autotools-dev openssh-clients
buildroot_packages =
-# ********** Install Image section ***********
+# ********** Install Image section **********
[installimage]
welcome_message = Welcome to Moblin:
@@ -191,18 +197,21 @@ fat32_partition_size = 4096
[installimage.menlow-lpia-ubuntu-hardy-ppa-snapshot]
fat32_partition_size = 4096
+[installimage.menlow-lpia-ume]
+fat32_partition_size = 4096
+
[installimage.menlow-lpia-ubuntu-hardy-jax10-snapshot1]
use_squashfs = 1
-boot_partition_size = 768
+boot_partition_size = 768
swap_partition_size = 512
[installimage.menlow-lpia-moblin2]
-use_squashfs = 1
-boot_partition_size = 768
+use_squashfs = 1
+boot_partition_size = 768
swap_partition_size = 512
[installimage.netbook-lpia-moblin2]
-boot_partition_size = 250
+boot_partition_size = 250
# Distribution information
# ubuntu = debian
diff --git a/libs/InstallImage.py b/libs/InstallImage.py
index abad843..ac9f30b 100755
--- a/libs/InstallImage.py
+++ b/libs/InstallImage.py
@@ -302,6 +302,8 @@ class InstallImage(object):
except OSError:
print _("shutil.copy failed. Ignored error")
self.kernels.pop(0)
+ if not os.path.exists("%s/boot/boot" % self.target.path):
+ os.symlink(".", "%s/boot/boot" % self.target.path)
fs_path = self.target.fs_path[len(self.project.path):]
fs_path = os.path.join(fs_path, 'boot')
image_path = self.target.image_path[len(self.project.path):]
@@ -398,22 +400,19 @@ class InstallImage(object):
if not os.path.exists(menu_dir):
os.makedirs(menu_dir)
self.target.chroot("update-grub -y")
- # FIXME: JLV: I really don't like all this sed usage, need to clean
this up
- #self.target.chroot("/bin/sed s+/boot/+/+g -i /boot/grub/menu.lst")
-
menu=open(os.path.join(self.target.fs_path,"boot","grub","menu.lst"),'r')
- for count, line in enumerate(menu):
- if line.find('title') == 0:
- print line
- if
line.find(self.default_kernel.split('vmlinuz-').pop().strip()) > 0:
- # FIXME: JLV: I really don't like all this sed usage, need
to clean this up
- cmd="sed s/^default.*/default\\t\\t%d/g -i
/boot/grub/menu.lst" % count
- print cmd
- self.target.chroot(cmd)
- break;
- menu.close()
+ f = open("%s/etc/kernel-img.conf" % self.target.path, 'w')
+ f.write("""# Generated by Moblin Image Creator #
+do_symlinks = no
+postinst_hook = update-grub
+postrm_hook = update-grub
+do_bootloader = no
+do_bootfloppy = no
+do_initrd = yes
+""")
+ f.close()
def create_grub_menu_yum(self):
- #FIXME: We need to generate grub menu
+ # FIXME: We need to generate grub menu
print _("Creating the grub menu")
# remove previous menu.lst, since we are about to create one
menu_dir = os.path.join(self.target.path, "boot/grub")
@@ -669,9 +668,9 @@ class InstallUsbImage(BaseUsbImage):
print _("InstallUsbImage: Finished!")
def apply_hd_kernel_cmdline(self):
+ # set kopt= (in AUTOMAGIC KERNELS LIST)
hd_kernel_cmdline =
self.project.get_target_hd_kernel_cmdline(self.target.name)
cmd = "sed -e 's:^\\s*#\\s*kopt\\s*=\\s*.*:# kopt=%s:' -i %s" %
(hd_kernel_cmdline, os.path.join(self.target.fs_path, 'boot', 'grub',
'menu.lst'))
- #cmd = "sed -e 's:^\\s*kernel\\s*\\([/a-zA-Z0-9._-]*\\).*:kernel
\\t\\t\\1 %s:g' -i %s" %
(self.project.get_target_hd_kernel_cmdline(self.target.name),
os.path.join(self.target.fs_path, 'boot', 'grub', 'menu.lst'))
print cmd
print os.popen(cmd).readlines()
print _("grub.conf kernel cmdline changed")
diff --git a/libs/Project.py b/libs/Project.py
index d2d40ab..7c03833 100755
--- a/libs/Project.py
+++ b/libs/Project.py
@@ -79,6 +79,9 @@ class FileSystem(object):
f = open("%s/etc/hostname" % self.path, 'w')
f.write("%s\n" % hostname)
f.close()
+ f = open("%s/etc/default/locale" % self.path, 'w')
+ f.write("LANG=en_US.UTF8\n")
+ f.close()
f = open("%s/etc/hosts" % self.path, 'w')
f.write("""# Generated by Moblin Image Creator #
127.0.0.1 localhost localhost.localdomain %s
diff --git a/libs/SDK.py b/libs/SDK.py
index f08fc10..1b8e9d6 100755
--- a/libs/SDK.py
+++ b/libs/SDK.py
@@ -145,8 +145,6 @@ class SDK(object):
self.progress_callback_func = progress_callback
self.status_label_callback_func = status_label_callback
self.config_path = os.path.join(self.var_dir, 'projects')
- if not os.path.isdir(self.config_path):
- os.mkdir(self.config_path)
# instantiate all platforms
self.platforms = {}
@@ -179,8 +177,6 @@ class SDK(object):
self.projects = {}
self.obsolete_projects = set()
directories = [ os.path.join(self.config_path, x) for x in
os.listdir(self.config_path) ]
- # FIXME: This is here for backwards compatibility, I would think that
- # after Jun-2008, we can delete this list
if os.path.exists(os.path.join(self.path, 'projects')):
old_directories = [ os.path.join(self.path, 'projects', x) for x
in os.listdir(os.path.join(self.path, 'projects')) ]
directories.extend(old_directories)
diff --git a/platforms/Makefile.am b/platforms/Makefile.am
index 0838aea..3718ab5 100644
--- a/platforms/Makefile.am
+++ b/platforms/Makefile.am
@@ -4,12 +4,14 @@ SUBDIRS = \
mccaslin-lpia-ubuntu-hardy \
mccaslin-lpia-ubuntu-hardy-ppa \
mccaslin-lpia-ubuntu-hardy-ppa-snapshot \
+ mccaslin-lpia-ume \
menlow-lpia \
+ menlow-lpia-moblin2 \
menlow-lpia-ubuntu-hardy \
+ menlow-lpia-ubuntu-hardy-jax10-snapshot1 \
menlow-lpia-ubuntu-hardy-ppa \
menlow-lpia-ubuntu-hardy-ppa-snapshot \
- menlow-lpia-ubuntu-hardy-jax10-snapshot1 \
- menlow-lpia-moblin2 \
+ menlow-lpia-ume \
netbook-lpia-moblin2
debootstrap_scriptdir = ${pkgdatadir}/debootstrap-scripts
diff --git a/platforms/common-apt/initramfs/cd
b/platforms/common-apt/initramfs/cd
index 9e45f67..b9c5bc6 100755
--- a/platforms/common-apt/initramfs/cd
+++ b/platforms/common-apt/initramfs/cd
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
# Live CD filesystem mounting -*- shell-script -*-
mountroot ()
diff --git a/platforms/common-apt/initramfs/disk
b/platforms/common-apt/initramfs/disk
index 1a06d5a..3fab0bd 100755
--- a/platforms/common-apt/initramfs/disk
+++ b/platforms/common-apt/initramfs/disk
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
# Unified squash Hard Disk filesystem mounting -*- shell-script -*-
mountroot ()
diff --git a/platforms/common-apt/initramfs/nand
b/platforms/common-apt/initramfs/nand
index 0c08f69..59d785f 100755
--- a/platforms/common-apt/initramfs/nand
+++ b/platforms/common-apt/initramfs/nand
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
# nand filesystem mounting -*- shell-script -*-
# current is only the hack shell inside the initrd
diff --git a/platforms/common-apt/initramfs/usb
b/platforms/common-apt/initramfs/usb
index 9cadf82..ac1b426 100755
--- a/platforms/common-apt/initramfs/usb
+++ b/platforms/common-apt/initramfs/usb
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
_______________________________________________
Commits mailing list
[email protected]
https://www.moblin.org/mailman/listinfo/commits
