diff options
| author | Philip Balister <philip@balister.org> | 2007-12-03 22:23:38 +0000 |
|---|---|---|
| committer | Philip Balister <philip@balister.org> | 2007-12-03 22:23:38 +0000 |
| commit | c9d9284e477752680bc176a2fa919c8fe14f5ee8 (patch) | |
| tree | 0894f21101a85f8040c0756ae4143e401908c10e /classes | |
| parent | 11acd60397990158e6b1c900136c038189f5452e (diff) | |
| parent | 4dc92f941e3afe632a0f08909713a0279ef9d2d5 (diff) | |
merge of '3979e1b277e23e3a99c5b86306581ddc32a83d53'
and '3fe444996883cc54a95f94bd89d9fba641d08c20'
Diffstat (limited to 'classes')
| -rw-r--r-- | classes/nslu2-image.bbclass | 2 | ||||
| -rw-r--r-- | classes/sip.bbclass | 10 |
2 files changed, 7 insertions, 5 deletions
diff --git a/classes/nslu2-image.bbclass b/classes/nslu2-image.bbclass index 33caa54b21..8be1fa762f 100644 --- a/classes/nslu2-image.bbclass +++ b/classes/nslu2-image.bbclass @@ -19,5 +19,5 @@ nslu2_pack_image () { -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-nslu2-16mb.bin } -EXTRA_IMAGEDEPENDS += 'slugimage-native nslu2-linksys-firmware ixp4xx-npe upslug2-native apex-nslu2 apex-nslu2-16mb' +EXTRA_IMAGEDEPENDS += 'slugimage-native nslu2-linksys-firmware ixp4xx-npe apex-nslu2 apex-nslu2-16mb' IMAGE_POSTPROCESS_COMMAND += "nslu2_pack_image; " diff --git a/classes/sip.bbclass b/classes/sip.bbclass index a258fda629..6f77f460dc 100644 --- a/classes/sip.bbclass +++ b/classes/sip.bbclass @@ -1,8 +1,10 @@ # Build Class for Sip based Python Bindings # (C) Michael 'Mickey' Lauer <mickey@Vanille.de> # -DEPENDS =+ "sip-native" -RDEPENDS += "python-sip" + +# yes, python-sip is actually a build-time dependency, since +# the recipe installs sip.h +DEPENDS =+ "sip-native python-sip" # default stuff, do not uncomment # EXTRA_SIPTAGS = "-tWS_X11 -tQt_4_3_0" @@ -34,8 +36,8 @@ sip_do_generate() { for module in $MODULES do install -d ${module}/ - echo "calling 'sip4 -I sip -I ${STAGING_SIPDIR} ${SIPTAGS} ${FEATURES} -c ${module} -b ${module}/${module}.pro.in sip/${module}/${module}mod.sip'" - sip4 -I ${STAGING_SIPDIR} -I sip ${SIPTAGS} ${FEATURES} -c ${module} -b ${module}/${module}.sbf \ + echo "calling 'sip -I sip -I ${STAGING_SIPDIR} ${SIPTAGS} ${FEATURES} -c ${module} -b ${module}/${module}.pro.in sip/${module}/${module}mod.sip'" + sip -I ${STAGING_SIPDIR} -I sip ${SIPTAGS} ${FEATURES} -c ${module} -b ${module}/${module}.sbf \ sip/${module}/${module}mod.sip || die "Error calling sip on ${module}" cat ${module}/${module}.sbf | sed s,target,TARGET, \ | sed s,sources,SOURCES, \ |