This email list is read-only. Emails sent to this list will be discarded
----------------------------------
debian/changelog | 3 ++-
image-creator | 12 ++++++++++--
libs/InstallImage.py | 10 ++--------
3 files changed, 14 insertions(+), 11 deletions(-)
New commits:
commit 4295aa4ea2df5f928ad3fc92fb97104f3b93a951
Author: Mitsutaka Amano <[EMAIL PROTECTED]>
Date: Wed Aug 13 20:54:15 2008 +0900
* Cleaned to dirty codes.
Diff in this email is a maximum of 400 lines.
diff --git a/debian/changelog b/debian/changelog
index ef989eb..d54aa9a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -97,8 +97,9 @@ moblin-image-creator (0.45) UNRELEASED; urgency=low
[ Mitsutaka Amano ]
* Added entry Makefile.am on mccaslin-lpia-fedora.
* Added entry busybox in defaults.cfg.
+ * Cleaned to dirty codes.
- -- Mitsutaka Amano <[EMAIL PROTECTED]> Wed, 13 Aug 2008 11:30:10 +0900
+ -- Mitsutaka Amano <[EMAIL PROTECTED]> Wed, 13 Aug 2008 20:53:52 +0900
moblin-image-creator (0.44) gaston; urgency=low
diff --git a/image-creator b/image-creator
index 49a569c..cbbf7d5 100755
--- a/image-creator
+++ b/image-creator
@@ -36,6 +36,10 @@ import pdk_utils
_ = gettext.lgettext
+ENVIRONMENT_VARS = {
+ 'PATH' : '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+}
+
debug = False
if mic_cfg.config.has_option('general', 'debug'):
debug = int(mic_cfg.config.get('general', 'debug'))
@@ -57,7 +61,8 @@ def main():
sys.exit(1)
# Make sure the executables we need are on the system
verifyExes()
-
+ # Set needed environment variables
+ setEnvironmentVariables()
# Initial stuff for Internationlization and Localization support.
# Locale stuff
# internationalization
@@ -142,7 +147,6 @@ def main():
return 1
sdk.umount()
return 0
-
def parseCommandLine():
valid_commands = {
@@ -680,6 +684,10 @@ def verifyExes():
print _("Without the executable(s) listed, image-creator will fail to
operate properly.")
sys.exit(1)
+def setEnvironmentVariables():
+ for key, value in ENVIRONMENT_VARS.iteritems():
+ os.environ[key] = value
+
if __name__ == '__main__':
if debug: sys.excepthook = print_exc_plus
sys.exit(main())
diff --git a/libs/InstallImage.py b/libs/InstallImage.py
index 4d96993..3a8a027 100755
--- a/libs/InstallImage.py
+++ b/libs/InstallImage.py
@@ -253,10 +253,7 @@ class InstallImage(object):
fs_path = self.target.fs_path[len(self.project.path):]
image_path = self.target.image_path[len(self.project.path):]
image_path = os.path.join(image_path,'rootfs.img')
- if self.project.platform.config_info['package_manager'] == 'apt':
- cmd = "mksquashfs %s %s -no-progress -ef %s" % (fs_path,
image_path, self.exclude_file)
- if self.project.platform.config_info['package_manager'] == 'yum':
- cmd = "/sbin/mksquashfs %s %s -info -ef %s" % (fs_path,
image_path, self.exclude_file)
+ cmd = "mksquashfs %s %s -no-progress -ef %s" % (fs_path,
image_path, self.exclude_file)
self.write_manifest(self.path)
self.target.umount()
print _("Executing the mksquashfs program: %s") % cmd
@@ -290,10 +287,7 @@ class InstallImage(object):
fs_path = os.path.join(fs_path, 'boot')
image_path = self.target.image_path[len(self.project.path):]
image_path = os.path.join(image_path,'bootfs.img')
- if self.project.platform.config_info['package_manager'] == 'apt':
- cmd = "mksquashfs %s %s -no-progress" % (fs_path,
image_path)
- if self.project.platform.config_info['package_manager'] == 'yum':
- cmd = "/sbin/mksquashfs %s %s -no-progress" % (fs_path,
image_path)
+ cmd = "mksquashfs %s %s -no-progress" % (fs_path, image_path)
self.project.chroot(cmd)
def delete_bootfs(self):
_______________________________________________
Commits mailing list
[email protected]
https://www.moblin.org/mailman/listinfo/commits
