mirror of
https://gitdl.cn/https://github.com/chakralinux/core.git
synced 2025-02-05 17:57:39 +08:00
82 lines
3.9 KiB
Diff
82 lines
3.9 KiB
Diff
|
--- larchify.py.orig 2011-03-20 09:52:50.446272578 +0100
|
||
|
|
+++ larchify.py 2011-04-05 16:48:02.869665385 +0200
|
||
|
|
@@ -99,9 +99,15 @@ class Builder:
|
||
|
|
|
||
|
|
# Copy kernel to medium boot directory
|
||
|
|
runcmd('cp -f %s/boot/%s %s/boot' %
|
||
|
|
- (self.installation0, self.kname, self.medium_dir))
|
||
|
|
+ (self.installation0, self.kname, self.medium_dir))
|
||
|
|
+ if os.path.isfile("%s/boot/%s" % (self.installation0, 'vmlinuz26-lts')):
|
||
|
|
+ runcmd('cp -f %s/boot/%s %s/boot' %
|
||
|
|
+ (self.installation0, 'vmlinuz26-lts', self.medium_dir))
|
||
|
|
+
|
||
|
|
# Remember file name
|
||
|
|
writefile(self.kname, self.medium_dir + '/boot/kernelname')
|
||
|
|
+ if os.path.isfile("%s/boot/%s" % (self.installation0, 'vmlinuz26-lts')):
|
||
|
|
+ writefile('vmlinuz26-lts', self.medium_dir + '/boot/kernelname-lts')
|
||
|
|
|
||
|
|
# if no saved system.sqf, squash the Arch installation at self.installation_dir
|
||
|
|
if not os.path.isfile(self.system_sqf):
|
||
|
|
@@ -463,9 +469,17 @@ class Builder:
|
||
|
|
comment("(WARNING): More than one kernel found:\n %s" %
|
||
|
|
"\n ".join(kernels))
|
||
|
|
self.kname = vmlinuz
|
||
|
|
-
|
||
|
|
+
|
||
|
|
# Try to read the kernel version from a *.kver file
|
||
|
|
self.kversion = None
|
||
|
|
+ if os.path.isfile("%s/boot/%s" % (self.installation0, 'vmlinuz26-lts')):
|
||
|
|
+ self.kversionlts = None
|
||
|
|
+ verfile = self.installation0 + '/etc/mkinitcpio.d/kernel26-lts.kver'
|
||
|
|
+ if os.path.isfile(verfile):
|
||
|
|
+ gvars = {}
|
||
|
|
+ execfile(verfile, gvars)
|
||
|
|
+ self.kversionlts = gvars.get('ALL_kver')
|
||
|
|
+
|
||
|
|
verfile = self.installation0 + '/etc/mkinitcpio.d/%s.kver' % self.kernel
|
||
|
|
if os.path.isfile(verfile):
|
||
|
|
gvars = {}
|
||
|
|
@@ -534,6 +548,8 @@ class Builder:
|
||
|
|
|
||
|
|
comment("Kernel: %s - version: %s" % (self.kname, self.kversion))
|
||
|
|
chroot(self.installation0, "depmod %s" % self.kversion)
|
||
|
|
+ if os.path.isfile("%s/boot/%s" % (self.installation0, 'vmlinuz26-lts')):
|
||
|
|
+ chroot(self.installation0, "depmod %s" % self.kversionlts)
|
||
|
|
return True
|
||
|
|
|
||
|
|
|
||
|
|
@@ -549,16 +565,30 @@ class Builder:
|
||
|
|
olpreset = '%s/%s.preset' % (oldir, self.kernel)
|
||
|
|
if not os.path.isfile("%s.larchsave" % self.presetfile):
|
||
|
|
runcmd("cp %s %s.larchsave" % (self.presetfile, olpreset))
|
||
|
|
-
|
||
|
|
+ if os.path.isfile("%s/boot/%s" % (self.installation0, 'vmlinuz26-lts')):
|
||
|
|
+ self.presetfilelts = self.installation0 + '/etc/mkinitcpio.d/kernel26-lts.preset'
|
||
|
|
+ olpresetlts = '%s/%s.preset' % (oldir, 'kernel26-lts')
|
||
|
|
+ if not os.path.isfile("%s.larchsave" % self.presetfilelts):
|
||
|
|
+ runcmd("cp %s %s.larchsave" % (self.presetfilelts, olpresetlts))
|
||
|
|
+
|
||
|
|
# Adapt larch.preset file for kernel name and replace standard preset
|
||
|
|
writefile(readfile(self.installation0 + '/etc/mkinitcpio.d/larch.preset'
|
||
|
|
).replace('_k_', self.kernel), olpreset)
|
||
|
|
+ if os.path.isfile("%s/boot/%s" % (self.installation0, 'vmlinuz26-lts')):
|
||
|
|
+ writefile(readfile(self.installation0 + '/etc/mkinitcpio.d/larch.preset'
|
||
|
|
+ ).replace('_k_', 'kernel26-lts').replace('larch.img', 'larch-lts.img'), olpresetlts)
|
||
|
|
|
||
|
|
# Generate initramfs
|
||
|
|
- return chroot(self.installation0,
|
||
|
|
+ chroot(self.installation0,
|
||
|
|
"mkinitcpio -k %s -c %s -g %s" %
|
||
|
|
(self.kversion, conf,
|
||
|
|
- CHROOT_DIR_MEDIUM + "/boot/larch.img"))
|
||
|
|
+ CHROOT_DIR_MEDIUM + "/boot/larch.img"))
|
||
|
|
+ if os.path.isfile("%s/boot/%s" % (self.installation0, 'vmlinuz26-lts')):
|
||
|
|
+ chroot(self.installation0,
|
||
|
|
+ "mkinitcpio -k %s -c %s -g %s" %
|
||
|
|
+ (self.kversionlts, conf,
|
||
|
|
+ CHROOT_DIR_MEDIUM + "/boot/larch-lts.img"))
|
||
|
|
+ return True
|
||
|
|
|
||
|
|
|
||
|
|
def encryptPW(pw):
|