diff options
| author | Paul Sokolovsky <pmiscml@gmail.com> | 2007-05-02 15:18:30 +0000 |
|---|---|---|
| committer | Paul Sokolovsky <pmiscml@gmail.com> | 2007-05-02 15:18:30 +0000 |
| commit | b2be337495c4a24f7e7d976eff6f0385ff98c598 (patch) | |
| tree | 428b207a2b9b0abc29328fc30789484bc39ff4de /classes | |
| parent | f1c1d6417dde3ca1f56c94015b3679eaf1435129 (diff) | |
| parent | fa1f831bbf452179c778e7698dedcae323a6dfb0 (diff) | |
merge of 'ba1cabe56e69c8589c61e7c884217cc75f950877'
and 'c3acd01a05c3a6ed64990e92ec184f98594b2bf5'
Diffstat (limited to 'classes')
| -rw-r--r-- | classes/cpan.bbclass | 4 | ||||
| -rw-r--r-- | classes/image.bbclass | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/classes/cpan.bbclass b/classes/cpan.bbclass index 687dbcd1cb..be08c84379 100644 --- a/classes/cpan.bbclass +++ b/classes/cpan.bbclass @@ -4,7 +4,7 @@ FILES_${PN} += '${libdir}/perl5 ${datadir}/perl5' EXTRA_CPANFLAGS ?= "" -DEPENDS += "perl-native" +DEPENDS += "perl perl-native" RDEPENDS += "perl" # Determine the staged version of perl from the perl configuration file @@ -54,7 +54,7 @@ PERLLIBDIRS = "${@perl_get_libdirs(d)}" export PERLCONFIGTARGET = "${@is_target(d)}" cpan_do_configure () { - perl Makefile.PL ${EXTRA_CPANFLAGS} + yes '' | perl Makefile.PL ${EXTRA_CPANFLAGS} if [ "${BUILD_SYS}" != "${HOST_SYS}" ]; then . ${STAGING_DIR}/${TARGET_SYS}/perl/config.sh if [ "${IS_NEW_PERL}" = "yes" ]; then diff --git a/classes/image.bbclass b/classes/image.bbclass index 2954dcdf39..5f1dfa2dce 100644 --- a/classes/image.bbclass +++ b/classes/image.bbclass @@ -80,7 +80,7 @@ fakeroot do_rootfs () { insert_feed_uris - rm -f ${IMAGE_ROOTFS}${libdir}/ipkg/lists/oe + rm -f ${IMAGE_ROOTFS}${libdir}/ipkg/lists/* ${IMAGE_PREPROCESS_COMMAND} |