From 431fce48b751065c7cc719b0b8ed7900bcfb94c8 Mon Sep 17 00:00:00 2001 From: Anas Nashif Date: Thu, 20 Jan 2011 09:59:26 +0000 Subject: [PATCH] more fixes, enhancements --- configurations.yaml | 109 +++++++++++++++++++++++-------------- custom/scripts/fstab-n900.post | 5 ++ custom/scripts/inittab-n900.post | 3 + custom/scripts/kboot.post | 3 + custom/scripts/kernel-handset.post | 20 +++++++ custom/scripts/serial-mfld.post | 4 ++ custom/scripts/u-boot.post | 4 ++ kickstart.tmpl | 9 ++- 8 files changed, 115 insertions(+), 42 deletions(-) create mode 100644 custom/scripts/fstab-n900.post create mode 100644 custom/scripts/inittab-n900.post create mode 100644 custom/scripts/kboot.post create mode 100644 custom/scripts/kernel-handset.post create mode 100644 custom/scripts/serial-mfld.post create mode 100644 custom/scripts/u-boot.post diff --git a/configurations.yaml b/configurations.yaml index 33e651b..0e42a01 100644 --- a/configurations.yaml +++ b/configurations.yaml @@ -4,7 +4,7 @@ Default: Keyboard: us PackageArgs: SaveRepos: True - Timezone: America/New_York + Timezone: America/Los_Angeles RootPass: meego DefaultUser: meego DefaultUserPass: meego @@ -25,16 +25,42 @@ CORE: - MeeGo X Window System NoChrootScripts: - buildname -HANDSET: +N900: + PartSize: 1700 + BootloaderTimeout: + BootloaderAppend: + Groups: + - MeeGo Core + - Minimal MeeGo X Window System + - X for Handsets + - MeeGo Compliance + - MeeGo Handset Desktop + - MeeGo Handset Applications + - MeeGo Base Development + Kernel: kernel-adaptation-n900 + PostScripts: + - prelink + - cleanup + NoChrootScripts: + - buildname + Architecture: ia32 + Repos: + - core + - handset + - non-oss +MFLD: PartSize: 1700 BootloaderAppend: "ro pci=noearly console=tty1 console=ttyS0 console=ttyMFD2 earlyprintk=mrst loglevel=8 s0ix_latency=160" BootloaderTimeout: 2 + Bootloader: True Groups: - - X for Netbooks - - Virtual Machine Support - - Printing - - Games - - MeeGo Netbook Desktop + - MeeGo Core + - Minimal MeeGo X Window System + - X for Handsets + - MeeGo Compliance + - MeeGo Handset Desktop + - MeeGo Handset Applications + - MeeGo Base Development Kernel: kernel PostScripts: - prelink @@ -42,8 +68,13 @@ HANDSET: NoChrootScripts: - buildname Architecture: ia32 + Repos: + - core + - handset + - non-oss NETBOOK: PartSize: 3000 + Bootloader: True BootloaderAppend: "quiet" BootloaderTimeout: 0 Groups: @@ -61,25 +92,6 @@ NETBOOK: Architecture: ia32 Configurations: - - Name: MeeGo Core - Active: True - Baseline: "1.1.80" - Platform: CORE - FileName: core-ia32-testing - Kernel: kernel-netbook - Architecture: ia32 - Repos: - - core-testing - - Name: MeeGo Core N900 - Active: True - Baseline: "1.1.80" - Platform: CORE - FileName: core-armv7l-n900-testing - Kernel: kernel-n900 - Desktop: - Architecture: armv7l - Repos: - - core-testing - Name: MeeGo Netbook/Nettop PartSize: 3000 Active: True @@ -96,22 +108,37 @@ Configurations: - netbook ExtraPackages: - chromium - - Name: MeeGo Core + - Name: MeeGo Handset N900 Active: True Baseline: "1.1.80" - Platform: CORE - FileName: core-ia32 - Kernel: kernel - Architecture: ia32 - Repos: - - core - - Name: MeeGo Core N900 + Platform: N900 + FileName: handset-armv7l-n900 + Architecture: armv7l + Desktop: DUI + Session: "/usr/bin/mcompositor" + Groups: + - Nokia N900 Support + - Nokia N900 Proprietary Support + ExtraPackages: + - xorg-x11-utils-xev + - u-boot-tools + PostScripts: + - inittab-n900 + - fstab-n900 + - u-boot + + - Name: MeeGo Handset MTF Active: True Baseline: "1.1.80" - Platform: CORE - FileName: core-armv7l-n900 - Kernel: kernel-adaptation-n900 - Desktop: - Architecture: armv7l - Repos: - - core + Platform: MFLD + FileName: handset-ia32-mtf + Kernel: kernel-adaptation-medfield + Architecture: ia32 + Desktop: DUI + Session: "/usr/bin/mcompositor" + Groups: + - Moorestown Support + PostScripts: + - kernel-handset + - kboot + - serial-mfld diff --git a/custom/scripts/fstab-n900.post b/custom/scripts/fstab-n900.post new file mode 100644 index 0000000..03b6fc1 --- /dev/null +++ b/custom/scripts/fstab-n900.post @@ -0,0 +1,5 @@ + +# Use eMMC swap partition as MeeGo swap as well. +# Because of the 2nd partition is swap for the partition numbering +# we can just change the current fstab entry to match the eMMC partition. +sed -i 's/mmcblk0p2/mmcblk1p3/g' /etc/fstab diff --git a/custom/scripts/inittab-n900.post b/custom/scripts/inittab-n900.post new file mode 100644 index 0000000..4650a2f --- /dev/null +++ b/custom/scripts/inittab-n900.post @@ -0,0 +1,3 @@ + +# open serial line console for embedded system +echo "s0:235:respawn:/sbin/agetty -L 115200 ttyS2 vt100" >> /etc/inittab diff --git a/custom/scripts/kboot.post b/custom/scripts/kboot.post new file mode 100644 index 0000000..d5d5183 --- /dev/null +++ b/custom/scripts/kboot.post @@ -0,0 +1,3 @@ +#Create Initrd if it does not exist and create symlinks for bzImage and initrd for kboot autoboot +echo "ro pci=noearly console=tty1 console=ttyS0 console=ttyMFD2 earlyprintk=mrst loglevel=8 s0ix_latency=160" > /boot/kboot.cmdline + diff --git a/custom/scripts/kernel-handset.post b/custom/scripts/kernel-handset.post new file mode 100644 index 0000000..f3805d4 --- /dev/null +++ b/custom/scripts/kernel-handset.post @@ -0,0 +1,20 @@ +reate Initrd if it does not exist and create symlinks for bzImage and initrd for kboot autoboot +echo "ro pci=noearly console=tty1 console=ttyS0 console=ttyMFD2 earlyprintk=mrst loglevel=8 s0ix_latency=160" > /boot/kboot.cmdline + +echo "Checking for kernel......." +Kernel_Name=`ls /boot | grep vmlinuz` +if [ -f /boot/$Kernel_Name ]; then + Kernel_Ver=`echo $Kernel_Name | sed s/vmlinuz-//` + if [ -f /boot/initrd* ]; then + echo "Initrd exists" > /dev/null + else + /usr/libexec/mkmrstinitrd /boot/initrd-$Kernel_Ver.img $Kernel_Ver + fi + #Create Symlinks + cd /boot + ln -s $Kernel_Name bzImage + ln -s initrd-$Kernel_Ver.img initrd + ln -s kboot.cmdline cmdline +else + echo "No Kernels were found" +fi diff --git a/custom/scripts/serial-mfld.post b/custom/scripts/serial-mfld.post new file mode 100644 index 0000000..c3c62b0 --- /dev/null +++ b/custom/scripts/serial-mfld.post @@ -0,0 +1,4 @@ +# open serial line console for embedded system +echo "s0:235:respawn:/sbin/agetty -L 115200 ttyS0 vt100" >> /etc/inittab +echo "s1:235:respawn:/sbin/agetty -L 115200 ttyMFD2 vt100" >> /etc/inittab +echo "ttyMFD2" >> /etc/securetty diff --git a/custom/scripts/u-boot.post b/custom/scripts/u-boot.post new file mode 100644 index 0000000..6377edc --- /dev/null +++ b/custom/scripts/u-boot.post @@ -0,0 +1,4 @@ + + +# Create the /boot/uImage for u-boot support. +mkimage -A arm -O linux -T kernel -C none -a 80008000 -e 80008000 -n vmlinuz -d /boot/vmlinuz* /boot/uImage diff --git a/kickstart.tmpl b/kickstart.tmpl index 4c8ad58..8ee3534 100644 --- a/kickstart.tmpl +++ b/kickstart.tmpl @@ -13,9 +13,16 @@ ${metadata.Part} #end if rootpw ${metadata.RootPass} xconfig --startxonboot +#if $metadata.has_key("Bootloader") bootloader --timeout=${metadata.BootloaderTimeout} --append="${metadata.BootloaderAppend}" +#end if #if $metadata.has_key("Desktop") -desktop --autologinuser=${metadata.DefaultUser} --defaultdesktop=${metadata.Desktop} +desktop --autologinuser=${metadata.DefaultUser} --defaultdesktop=${metadata.Desktop} #slurp +#end if +#if $metadata.has_key("Session") +--session="${metadata.Session}" +#else + #end if user --name ${metadata.DefaultUser} --groups audio,video --password ${metadata.DefaultUserPass} -- 2.7.4