diff options
| -rw-r--r-- | conf/machine/htcblueangel.conf (renamed from conf/machine/blueangel.conf) | 0 | ||||
| -rw-r--r-- | packages/imagemagick/imagemagick_6.2.9.bb | 3 | ||||
| -rw-r--r-- | packages/images/slugos-image.bb | 2 | ||||
| -rw-r--r-- | packages/linux/linux-handhelds-2.6.inc | 2 |
4 files changed, 4 insertions, 3 deletions
diff --git a/conf/machine/blueangel.conf b/conf/machine/htcblueangel.conf index dd079c244b..dd079c244b 100644 --- a/conf/machine/blueangel.conf +++ b/conf/machine/htcblueangel.conf 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 ?= "" diff --git a/packages/linux/linux-handhelds-2.6.inc b/packages/linux/linux-handhelds-2.6.inc index 09cd9fd480..01026cbb79 100644 --- a/packages/linux/linux-handhelds-2.6.inc +++ b/packages/linux/linux-handhelds-2.6.inc @@ -3,7 +3,7 @@ DESCRIPTION = "handhelds.org Linux kernel 2.6 for PocketPCs and other consumer h LICENSE = "GPL" COMPATIBLE_HOST = "arm.*-linux" -COMPATIBLE_MACHINE ?= '(h1910|h2200|h3600|h3900|h4000|h5000|htcuniversal|hx4700|jornada56x|magician|simpad|blueangel)' +COMPATIBLE_MACHINE ?= '(h1910|h2200|h3600|h3900|h4000|h5000|htcblueangel|htcuniversal|hx4700|jornada56x|magician|simpad)' # SRC_URI *must* be overriden in includer, but this is a good reference SRC_URI ?= "${HANDHELDS_CVS};module=linux/kernel26;tag=${@'K' + bb.data.getVar('PV',d,1).replace('.', '-')} \ |