diff options
| author |   Paul Sokolovsky <pmiscml@gmail.com> | 2006-12-28 18:29:03 +0000 |
|---|---|---|
| committer | Paul Sokolovsky <pmiscml@gmail.com> | 2006-12-28 18:29:03 +0000 |
| commit | 599aa2ea67f543f39ae65998a970786190b96612 (patch) | |
| tree | 2ef9598c7c93e29677758f2509282e2987dc5c40 | |
| parent | c9ee1fb8c31cb262ce916e8de10bf0e2941acd10 (diff) | |
| parent | 457ff435ac6876fcf346010fd0df692277661525 (diff) | |
| download | openembedded-599aa2ea67f543f39ae65998a970786190b96612.tar.gz | |
merge of '67bd2a01b2c73ef78e1377bb96d53fbd47234ce4'
and '7f3e4e4b673d55d27ea70c09699c29ae8871a6f5'
| -rw-r--r-- | packages/imagemagick/imagemagick_6.2.9.bb | 3 | ||||
| -rw-r--r-- | packages/images/slugos-image.bb | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/packages/imagemagick/imagemagick_6.2.9.bb b/packages/imagemagick/imagemagick_6.2.9.bb index cac16329c4..33748a005e 100644 --- a/packages/imagemagick/imagemagick_6.2.9.bb +++ b/packages/imagemagick/imagemagick_6.2.9.bb @@ -10,7 +10,8 @@ S = "${WORKDIR}/ImageMagick-${PV}" inherit autotools -EXTRA_OECONF="-without-x " +EXTRA_OECONF="--without-x" +EXTRA_OECONF_openprotium="--without-x --without-xml --without-perl" LEAD_SONAME="libMagick.so.*" diff --git a/packages/images/slugos-image.bb b/packages/images/slugos-image.bb index df8a4d6222..0e034005e7 100644 --- a/packages/images/slugos-image.bb +++ b/packages/images/slugos-image.bb @@ -112,7 +112,7 @@ python () { # it is a bad idea to produce flash images without a valid RedBoot - that allows # an innocent user upgrade attempt to instantly brick the NSLU2. PACK_IMAGE += "${@['', 'slugos_pack_image;'][bb.data.getVar('SLUGOS_FLASH_IMAGE', d, 1) == '1']}" -PACK_IMAGE_DEPENDS += "${@['', 'slugimage-native nslu2-linksys-firmware apex ixp4xx-npe'][bb.data.getVar('SLUGOS_FLASH_IMAGE', d, 1) == 'nslu2']}" +PACK_IMAGE_DEPENDS += "${@['', 'slugimage-native nslu2-linksys-firmware apex ixp4xx-npe'][bb.data.getVar('SLUGOS_FLASH_IMAGE', d, 1) == '1']}" NSLU2_SLUGIMAGE_ARGS ?= "" |