diff options
| author |   Michael Lauer <mickey@vanille-media.de> | 2007-09-11 13:54:03 +0000 |
|---|---|---|
| committer | Michael Lauer <mickey@vanille-media.de> | 2007-09-11 13:54:03 +0000 |
| commit | 3e72139bd9476307035d85b73634c920037269a5 (patch) | |
| tree | e4180f1ecf2bb6487585de39f21f425fa74304c4 | |
| parent | 0e130de26c131349596b6435e49e69cff37d59db (diff) | |
| parent | 8013441436d8bef02872333da11c3668165e4bd7 (diff) | |
| download | openembedded-3e72139bd9476307035d85b73634c920037269a5.tar.gz | |
merge of '3fcc49d84194b9665e260098b358d5a1848e697b'
and '86f3076c176e5860f297ef5a29fdd170ade23792'
| -rw-r--r-- | packages/images/liveramdisk-image.bb | 28 | ||||
| -rw-r--r-- | packages/initrdscripts/initramfs-jffs2/jffs2boot.sh | 2 | ||||
| -rw-r--r-- | packages/initrdscripts/initramfs-jffs2_0.1.bb | 2 | ||||
| -rw-r--r-- | packages/madwifi/madwifi-ng_r2702-20070903.bb | 1 |
4 files changed, 31 insertions, 2 deletions
diff --git a/packages/images/liveramdisk-image.bb b/packages/images/liveramdisk-image.bb new file mode 100644 index 0000000000..026ed7b81c --- /dev/null +++ b/packages/images/liveramdisk-image.bb @@ -0,0 +1,28 @@ +# LiveRamdisk image +# Hwo to build: +# First build angstrom-x11-image with glibc +# then switch to ANGSTROM_MODE=uclibc and build this recipe +# LiveRamdisk concept/implementation by Paul Sokolovsky +LICENSE = "MIT" +IMAGE_FSTYPES = "cpio.gz" + +#IMAGE_INSTALL = "initramfs-boot busybox kernel-module-uinput uclibc libgcc1" +IMAGE_INSTALL = "initramfs-jffs2 busybox-static kernel-module-mtdram" + +export IMAGE_BASENAME = "liveramdisk" +export IMAGE_LINGUAS = "" + +# Install only ${IMAGE_INSTALL}, not even deps +PACKAGE_INSTALL_NO_DEPS = "1" + +inherit image + +IMAGE_PREPROCESS_COMMAND += " copy_jffs2_image; " + +copy_jffs2_image() { + # We need glibc main image + latest_image=`ls -1 -r ${DEPLOY_DIR}/../glibc/images/${MACHINE}/Angstrom-x11-image-glibc-*.rootfs.jffs2|head -n1` + [ -n "$latest_image" ] || oefatal "Cannot find jffs2 image in ${DEPLOY_DIR}/../glibc/images/${MACHINE}/" + oenote "Using: cp $latest_image ${IMAGE_ROOTFS}/initrd.jffs2" + cp $latest_image ${IMAGE_ROOTFS}/initrd.jffs2 +} diff --git a/packages/initrdscripts/initramfs-jffs2/jffs2boot.sh b/packages/initrdscripts/initramfs-jffs2/jffs2boot.sh index 81077eeae5..18f4d93273 100644 --- a/packages/initrdscripts/initramfs-jffs2/jffs2boot.sh +++ b/packages/initrdscripts/initramfs-jffs2/jffs2boot.sh @@ -4,7 +4,7 @@ echo "Starting initrd boot..." mkdir /proc mount -t proc proc /proc -modprobe mtdram total_size=24576 erase_size=256 +modprobe mtdram total_size=25088 erase_size=256 sleep 1 ID=`grep "mtdram test device" /proc/mtd | cut -d: -f1| cut -b4-` diff --git a/packages/initrdscripts/initramfs-jffs2_0.1.bb b/packages/initrdscripts/initramfs-jffs2_0.1.bb index 78034c99c9..3e11465536 100644 --- a/packages/initrdscripts/initramfs-jffs2_0.1.bb +++ b/packages/initrdscripts/initramfs-jffs2_0.1.bb @@ -1,5 +1,5 @@ SRC_URI = "file://jffs2boot.sh" -PR = "r0" +PR = "r1" do_install() { install -m 0755 ${WORKDIR}/jffs2boot.sh ${D}/init diff --git a/packages/madwifi/madwifi-ng_r2702-20070903.bb b/packages/madwifi/madwifi-ng_r2702-20070903.bb index cf614c96ae..43a491bd1f 100644 --- a/packages/madwifi/madwifi-ng_r2702-20070903.bb +++ b/packages/madwifi/madwifi-ng_r2702-20070903.bb @@ -3,6 +3,7 @@ # Don't use this unless you know what you're doing -- this version does # *NOT* build on BE kernels. DEFAULT_PREFERENCE = "-1" +DEFAULT_PREFERENCE_alix = "1" # Disable stripping of kernel modules, since this action strips too # much out, and the resulting module won't load. |