diff options
| author | Rod Whitby <rod@whitby.id.au> | 2007-02-15 06:21:02 +0000 |
|---|---|---|
| committer | Rod Whitby <rod@whitby.id.au> | 2007-02-15 06:21:02 +0000 |
| commit | e1e32c67afc50d7b9eafa15052f91fbc80890049 (patch) | |
| tree | e83f8c7a9c5f684bf1994f8c153e7aae3eeb73f4 | |
| parent | b36aaa0e6238f8a966561edb444f4661e84b801d (diff) | |
| parent | 4ba037dc78a5beb8cb16a523ae0ca5ea63c9184b (diff) | |
merge of '1c7464901fc8ab3cb0e3ade6fdf445011603f0c4'
and '5696d93cf7ba3449e090b00b16a4acc06e5377f6'
| -rw-r--r-- | conf/distro/mokoslug.conf | 2 | ||||
| -rw-r--r-- | packages/linux/ixp4xx-kernel.inc | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/conf/distro/mokoslug.conf b/conf/distro/mokoslug.conf index c2c6857831..ea20fdd6b6 100644 --- a/conf/distro/mokoslug.conf +++ b/conf/distro/mokoslug.conf @@ -18,3 +18,5 @@ MACHINE_FEATURES_append_nslu2 = " bluetooth" # No room for debug apps in 8MB. DEBUG_APPS = "" + +INHERIT += "nslu2-image"
\ No newline at end of file diff --git a/packages/linux/ixp4xx-kernel.inc b/packages/linux/ixp4xx-kernel.inc index d848427921..57d3028742 100644 --- a/packages/linux/ixp4xx-kernel.inc +++ b/packages/linux/ixp4xx-kernel.inc @@ -337,7 +337,7 @@ install_image() { do_install_append() { # Overwrite the unshimmed generic image with a shimmed one (but without # any command line or machine id override). - rm -f '${D}/${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-${KERNEL_VERISON}' + rm -f '${D}/${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-${KERNEL_VERSION}' install_image '${MACHINE_ARCH}' # Add the machine specific images, with appropriate suffixes |