[oe-commits] org.oe.angstrom-2007.12-stable merge of '0fef82cac45748f3358e374359839a55f64ccc41'
koen commit
openembedded-commits at lists.openembedded.org
Wed Feb 6 21:02:55 UTC 2008
merge of '0fef82cac45748f3358e374359839a55f64ccc41'
and 'f4fd5000d2eb3251c85ad91479c67dbdb1cba010'
Author: koen at openembedded.org
Branch: org.openembedded.angstrom-2007.12-stable
Revision: 75659c5f8c92ef43d935adeb597623b081c46d56
ViewMTN: http://monotone.openembedded.org/revision/info/75659c5f8c92ef43d935adeb597623b081c46d56
Files:
1
contrib/angstrom/gen-machines-ext2.sh
contrib/angstrom/gen-machines-liveramdisk.sh
BACKPORTS.txt
conf/machine/h5000.conf
contrib/angstrom/build-release.sh
packages/tasks/task-base.bb
mtn:execute
true
conf/distro/angstrom-2007.1.conf
Diffs:
#
# mt diff -r0fef82cac45748f3358e374359839a55f64ccc41 -r75659c5f8c92ef43d935adeb597623b081c46d56
#
#
#
# add_file "contrib/angstrom/gen-machines-ext2.sh"
# content [fd9ddfb80f89cb30c02644ec300d174e21f0b700]
#
# add_file "contrib/angstrom/gen-machines-liveramdisk.sh"
# content [6b724546a230c56a8bf882a03ffb0042348b2da6]
#
# patch "BACKPORTS.txt"
# from [04fa9daa5c7fce65aec29d85db37a01e1157b3fb]
# to [b0b1011fcb7a1fee9d9a7238384fb900be881faa]
#
# patch "conf/machine/h5000.conf"
# from [b6fb552c41aeff2850cd35e5d3dfb99733e1e56d]
# to [b0fe52891e392a5d43162145964546c7517d27e4]
#
# patch "contrib/angstrom/build-release.sh"
# from [88bfd613aa56bfa26e1519c63464bfc02252720b]
# to [8dc1e9b29845a9c075fc3e435e7c45e22c7cdbf6]
#
# patch "packages/tasks/task-base.bb"
# from [2ef7c7b6aa8d583973deb733c4c4ea6efdffe5eb]
# to [bd3846298968930944a124e0ca88d13fbcc717e2]
#
# set "contrib/angstrom/gen-machines-ext2.sh"
# attr "mtn:execute"
# value "true"
#
# set "contrib/angstrom/gen-machines-liveramdisk.sh"
# attr "mtn:execute"
# value "true"
#
============================================================
--- contrib/angstrom/gen-machines-ext2.sh fd9ddfb80f89cb30c02644ec300d174e21f0b700
+++ contrib/angstrom/gen-machines-ext2.sh fd9ddfb80f89cb30c02644ec300d174e21f0b700
@@ -0,0 +1,25 @@
+#!/bin/sh
+
+#
+# This script generates ext2 images for loopback install from tar.gz images.
+# requires tar2ext2 script
+#
+
+MACHINES="h2200 h3900 h4000 h5000 hx4700 htcapache htcblueangel htcuniversal"
+SIZE="80" # in MB
+
+EXT="tar.gz"
+
+for m in $MACHINES; do
+ for f in `find $m -name "A*x11-image*.$EXT" -o -name "A*opie-image*.$EXT"`; do
+ base=$(basename $f .$EXT)
+ dir=$(dirname $f)
+ if [ ! -f $dir/$base.img.bz2 ]; then
+ echo $f - need gen
+ tar2ext2 $f $SIZE
+ bzip2 -f -9 $dir/$base.img
+ else
+ echo $f - already there
+ fi
+ done
+done
============================================================
--- contrib/angstrom/gen-machines-liveramdisk.sh 6b724546a230c56a8bf882a03ffb0042348b2da6
+++ contrib/angstrom/gen-machines-liveramdisk.sh 6b724546a230c56a8bf882a03ffb0042348b2da6
@@ -0,0 +1,54 @@
+#!/bin/sh
+
+#
+# This script generates LiveRamdisk executable image from:
+# 1. jffs2 rootfs images
+# 2. LiveRamdisk initramfs image
+# 3. Kernel
+# 4. HaRET script
+# Requires both HaRET sources and executable
+#
+
+MACHINES="h2200 h3900 h4000 h5000 hx4700 htcapache htcblueangel htcuniversal"
+
+EXT="jffs2"
+
+# This is what has been built with:
+# ANGSTROM_MODE=uclibc MACHINE=h4000 IMAGE_FSTYPES="cpio.gz" bitbake liveramdisk-image
+LIVERAMDISK_FILE=~/pfalcon/Angstrom-liveramdisk-uclibc-ipk-2007.11RC1.3-h4000.rootfs.cpio.gz
+# Directory where HaRET source has been checked out
+HARET_PATH=~/pfalcon/haret
+
+# HaRET executable
+HARET_EXE=$HARET_PATH/haret-0.5.0.exe
+LIVERAMDISK_SCRIPT=$HARET_PATH/tools/safeboot-initramfs.txt
+
+for m in $MACHINES; do
+ for f in `find $m -name "A*x11-image*.$EXT" -o -name "A*opie-image*.$EXT"`; do
+ base=$(basename $f .$EXT)
+ dir=$(dirname $f)
+ image_name=`expr "$base" : '\(.\+\)-glibc.*'`
+ image_ver=`expr "$base" : '.\+-glibc-ipk-\(.*\)\.rootfs'`
+ liveramdisk_name="$image_name-liveramdisk-$image_ver.exe"
+ # Use the latest kernel version
+ kernel_name=`ls -1 -t $dir/zImage* | head -n1`
+
+ if [ ! -f "$dir/$liveramdisk_name" ]; then
+ echo $f - need gen
+
+ # Generate complete LiveRamdisk initramfs by putting jffs2 rootfs into liveramdisk-image cpio
+ gzip -d -c $LIVERAMDISK_FILE | $HARET_PATH/tools/cpio-append.py $f initrd.jffs2 | gzip -c > $dir/$base.liveramdisk.cpio.gz
+ # Now create executable bundle from all 4 parts
+ $HARET_PATH/tools/make-bootbundle.py \
+ $HARET_EXE \
+ $kernel_name \
+ $dir/$base.liveramdisk.cpio.gz \
+ $LIVERAMDISK_SCRIPT \
+ -o "$dir/$liveramdisk_name"
+ # Remove temporary file
+ rm $dir/$base.liveramdisk.cpio.gz
+ else
+ echo $dir/$liveramdisk_name - already there
+ fi
+ done
+done
============================================================
--- BACKPORTS.txt 04fa9daa5c7fce65aec29d85db37a01e1157b3fb
+++ BACKPORTS.txt b0b1011fcb7a1fee9d9a7238384fb900be881faa
@@ -12,8 +12,6 @@
16d9e54aa5518e5cf7f8c86dcf394a34ca1e771d "
334c3fe81497cd0c121f6445b9053dc3b6b40a2e "
c6fac7ea20ca568a16a2b76aae0eb280f2faf7a3 "
-4f0260db452e1d17accce2d4d5bdb2c928659a73 h5000.conf: Ship kernel-module-i2c-pxa. (Koen)
-647847c7187d536c71adab58568757d34b048ac2 h5000.conf: Ship BT module. (Koen)
Acked:
@@ -78,5 +76,7 @@
40ab8178005b44226c94200bdcb19bca0262e49c simpad kernel update (PaulS, Koen)
33c44c7c7ce5fce5da6c869be191126d5fca6f96 bluez-utils 3.23 and friends: Set FILESPATH explicitly and correctly. (PaulS, Koen)
02945aaeb0e67e273a58bf42b1a0a7988a413f92 cups tweak (Koen, PaulS)
+4f0260db452e1d17accce2d4d5bdb2c928659a73 h5000.conf: Ship kernel-module-i2c-pxa. (PaulS, Koen)
+647847c7187d536c71adab58568757d34b048ac2 h5000.conf: Ship BT module. (PaulS, Koen)
============================================================
--- conf/machine/h5000.conf b6fb552c41aeff2850cd35e5d3dfb99733e1e56d
+++ conf/machine/h5000.conf b0fe52891e392a5d43162145964546c7517d27e4
@@ -27,7 +27,9 @@ MACHINE_EXTRA_RRECOMMENDS = " kernel-mod
MACHINE_EXTRA_RDEPENDS = "kernel ipaq-boot-params"
MACHINE_EXTRA_RRECOMMENDS = " kernel-module-h5400-lcd \
kernel-module-h5400-battery \
- kernel-module-snd-soc-h5000"
+ kernel-module-h5400-bt \
+ kernel-module-snd-soc-h5000 \
+ kernel-module-i2c-pxa"
#
# Modules autoload and other boot properties
============================================================
--- contrib/angstrom/build-release.sh 88bfd613aa56bfa26e1519c63464bfc02252720b
+++ contrib/angstrom/build-release.sh 8dc1e9b29845a9c075fc3e435e7c45e22c7cdbf6
@@ -1,25 +1,32 @@
#!/bin/bash
+DO_GLIBC=1
DO_UCLIBC=0
do_build() {
echo "MACHINE = \"$BUILD_MACHINE\"" > conf/auto.conf
- BUILD_MODE="glibc"
- if [ "$BUILD_CLEAN" != "" ]
+ if [ $DO_GLIBC = 1 ]
then
- bitbake -c clean $BUILD_CLEAN
+ BUILD_MODE="glibc"
+ if [ "$BUILD_CLEAN" != "" ]
+ then
+ bitbake -c clean $BUILD_CLEAN
+ fi
+ for target in $BUILD_TARGETS
+ do
+ bitbake $target && do_report_success
+ done
fi
- for target in $BUILD_TARGETS
- do
- bitbake $target && do_report_success
- done
-
if [ $DO_UCLIBC = 1 ]
then
BUILD_MODE="uclibc"
echo 'ANGSTROM_MODE = "uclibc"' >> conf/auto.conf
+ if [ "$BUILD_CLEAN" != "" ]
+ then
+ bitbake -c clean $BUILD_CLEAN
+ fi
for target in $BUILD_TARGETS
do
bitbake $target && do_report_success
@@ -111,3 +118,28 @@ done
# do_build
#done
+#
+# Special uclibc targets
+#
+DO_GLIBC=0
+DO_UCLIBC=1
+
+# Bootmenu image
+# As of now, not machine-dependent, so we build random armv5 machine
+# Better to build armv4, but that's what I actually tested ;-). So, on TODO.
+for machine in h4000
+do
+ BUILD_CLEAN=""
+ BUILD_MACHINE=$machine
+ BUILD_TARGETS="initramfs-bootmenu-image"
+ do_build
+done
+
+# LiveRamdisk core. Same note applies.
+for machine in h4000
+do
+ BUILD_CLEAN=""
+ BUILD_MACHINE=$machine
+ BUILD_TARGETS="liveramdisk-image"
+ do_build
+done
============================================================
--- packages/tasks/task-base.bb 2ef7c7b6aa8d583973deb733c4c4ea6efdffe5eb
+++ packages/tasks/task-base.bb bd3846298968930944a124e0ca88d13fbcc717e2
@@ -1,5 +1,5 @@ DESCRIPTION = "Merge machine and distro
DESCRIPTION = "Merge machine and distro options to create a basic machine task/package"
-PR = "r57"
+PR = "r59"
inherit task
#
# mt diff -rf4fd5000d2eb3251c85ad91479c67dbdb1cba010 -r75659c5f8c92ef43d935adeb597623b081c46d56
#
#
#
# patch "conf/distro/angstrom-2007.1.conf"
# from [69601316a679a24839064fa4f70f029c76e58bd8]
# to [4d26af58762b0c1236b665c7fdeeed26863d3fc3]
#
============================================================
--- conf/distro/angstrom-2007.1.conf 69601316a679a24839064fa4f70f029c76e58bd8
+++ conf/distro/angstrom-2007.1.conf 4d26af58762b0c1236b665c7fdeeed26863d3fc3
@@ -6,7 +6,7 @@
#@MAINTAINER: Michael 'Mickey' Lauer <mickey at Vanille.de>
#@--------------------------------------------------------------------
-DISTRO_VERSION = "2007.12-r3"
+DISTRO_VERSION = "2007.12-r4"
DISTRO_REVISION = "52"
require conf/distro/include/sane-srcdates.inc
More information about the Openembedded-commits
mailing list