commit e90484e1dbbba4dc7b143d9ab625e1c844bcdd98
Author: Marko Saukko <[email protected]>
Date: Thu Dec 2 12:56:25 2010 +0200
Some cleanup for the bootstrap.
diff --git a/mic/imgcreate/bootstrap.py b/mic/imgcreate/bootstrap.py
index f5bfefe..5634142 100644
--- a/mic/imgcreate/bootstrap.py
+++ b/mic/imgcreate/bootstrap.py
@@ -376,12 +376,18 @@ def build_bootstrap(repourl, cachedir, reponame,
bootstrapdir, proxies = {}, arc
installed_pkgs.append(pkg)
# First install a mini base
- pkglist = ["bash", "setup", "filesystem", "basesystem",
"nss-softokn-freebl", "cpio", "info", "glibc-common", "libgcc", "glibc"]
+ pkglist = ["bash", "setup", "filesystem", "basesystem",
+ "nss-softokn-freebl", "cpio", "info", "glibc-common",
+ "libgcc", "glibc"]
+
for pkg in pkglist:
download_and_install(pkg, True)
- pkglist = ["glibc", "passwd", "pam-modules-cracklib", "meego-release",
"moblin-release", "fastinit", "nss", "genisoimage", "bzip2", "gzip", "cpio",
"perl", "syslinux-extlinux", "btrfs-progs", "make", "file", "psmisc", "mic2"]
- pkglist.extend(["isomd5sum", "wget"])
+ pkglist = ["glibc", "passwd", "pam-modules-cracklib", "meego-release",
+ "moblin-release", "fastinit", "nss", "genisoimage", "bzip2",
+ "gzip", "cpio", "perl", "syslinux-extlinux", "btrfs-progs",
+ "make", "file", "psmisc", "mic2", "isomd5sum", "wget"]
+
for pkg in pkglist:
for node in get_my_all_deps_in_order(pkg, con):
#download_and_install(node["name"], node["isleaf"])
@@ -398,13 +404,12 @@ def build_bootstrap(repourl, cachedir, reponame,
bootstrapdir, proxies = {}, arc
fd.close()
def isbootstrap(rootdir):
- ret = False
- if (os.path.exists(rootdir + "/etc/meego-release") or
os.path.exists(rootdir + "/etc/moblin-release")) \
- and os.path.exists(rootdir + "/etc/inittab") \
- and os.path.exists(rootdir + "/etc/rc.sysinit"):
- ret = True
+ if (os.path.exists(rootdir + "/etc/meego-release") \
+ or os.path.exists(rootdir + "/etc/moblin-release")) \
+ and os.path.exists(rootdir + "/bin/bash"):
+ return True
- return ret
+ return False
def has_package_in_repo(con, pkg):
for row in con.execute("select * from packages where name = \"%s\"" % pkg):
_______________________________________________
MeeGo-distribution-tools mailing list
[email protected]
http://lists.meego.com/listinfo/meego-distribution-tools
