diff options
| author |   Paul Sokolovsky <pmiscml@gmail.com> | 2008-03-14 21:43:25 +0000 |
|---|---|---|
| committer | Paul Sokolovsky <pmiscml@gmail.com> | 2008-03-14 21:43:25 +0000 |
| commit | 8f69f59a99c98d7cc3a230480c25a92b6a9916a9 (patch) | |
| tree | 8b868522bb9cd49f08db2018468e3de30bf46284 | |
| parent | c7eb995f9e1ff26f2afa3f802444a7e35f7005ed (diff) | |
| download | openembedded-8f69f59a99c98d7cc3a230480c25a92b6a9916a9.tar.gz | |
applied changes from a3b18a00a09e716f4b3d5bfced86fea0439953a0
through 825754db28a782e72d84614900aff9f88d9f6349
liveramdisk-image, initramfs-jffs2: Be sure to depend on/load mtdblock. (PaulS, Koen)
| -rw-r--r-- | packages/images/liveramdisk-image.bb | 7 | ||||
| -rw-r--r-- | packages/initrdscripts/initramfs-jffs2/jffs2boot.sh | 1 | ||||
| -rw-r--r-- | packages/initrdscripts/initramfs-jffs2_0.1.bb | 3 |
3 files changed, 9 insertions, 2 deletions
diff --git a/packages/images/liveramdisk-image.bb b/packages/images/liveramdisk-image.bb index b3c288ec31..5d2362353b 100644 --- a/packages/images/liveramdisk-image.bb +++ b/packages/images/liveramdisk-image.bb @@ -12,6 +12,11 @@ export IMAGE_BASENAME = "liveramdisk" export IMAGE_LINGUAS = "" # Install only ${IMAGE_INSTALL}, not even deps -PACKAGE_INSTALL_NO_DEPS = "1" +#PACKAGE_INSTALL_NO_DEPS = "1" + +# Remove any kernel-image that the kernel-module-* packages may have pulled in. +PACKAGE_REMOVE = "kernel-image-* update-modules module-init-tools-depmod uclibc update-rc.d" +ROOTFS_POSTPROCESS_COMMAND += "ipkg-cl ${IPKG_ARGS} -force-depends \ + remove ${PACKAGE_REMOVE};" inherit image diff --git a/packages/initrdscripts/initramfs-jffs2/jffs2boot.sh b/packages/initrdscripts/initramfs-jffs2/jffs2boot.sh index 18f4d93273..f81fc5226f 100644 --- a/packages/initrdscripts/initramfs-jffs2/jffs2boot.sh +++ b/packages/initrdscripts/initramfs-jffs2/jffs2boot.sh @@ -4,6 +4,7 @@ echo "Starting initrd boot..." mkdir /proc mount -t proc proc /proc +modprobe -q mtdblock modprobe mtdram total_size=25088 erase_size=256 sleep 1 diff --git a/packages/initrdscripts/initramfs-jffs2_0.1.bb b/packages/initrdscripts/initramfs-jffs2_0.1.bb index f938b9d3b1..812e612126 100644 --- a/packages/initrdscripts/initramfs-jffs2_0.1.bb +++ b/packages/initrdscripts/initramfs-jffs2_0.1.bb @@ -1,5 +1,6 @@ SRC_URI = "file://jffs2boot.sh" -PR = "r2" +PR = "r3" +RRECOMMENDS = "kernel-module-mtdblock kernel-module-mtdram" do_install() { install -m 0755 ${WORKDIR}/jffs2boot.sh ${D}/init |