diff options
| author | Paul Sokolovsky <pmiscml@gmail.com> | 2008-03-07 21:23:28 +0000 |
|---|---|---|
| committer | Paul Sokolovsky <pmiscml@gmail.com> | 2008-03-07 21:23:28 +0000 |
| commit | 5433bbf3ff49cefea0d49c8ff29a1dfadd064261 (patch) | |
| tree | 92e91f8af881632c446877c7584e8697276dabb1 | |
| parent | 3810947a62841c6e9dd9ffa6cce8390d3f9c8738 (diff) | |
| parent | 5e0f7d2df667d7bfd3062636cfb5e5db6149690a (diff) | |
merge of '514c74770d16faa584d0781f1cd2f02bd79b5008'
and '825754db28a782e72d84614900aff9f88d9f6349'
| -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 |