[oe] [PATCH] kernel.bbclass only install image in do_deploy if not installing from packaged staging
Frans Meulenbroeks
fransmeulenbroeks at gmail.com
Thu Jan 28 21:55:28 UTC 2010
install -m 0644 ${KERNEL_OUTPUT} ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE_BASE_NAME}.bin
expandds to
install -m 0644 arch/arm/boot/uImage .../deploy/glibc/images/beagleboard/uImage-2.6.29-r51-beagleboard.bin
but of course arch/arm/boot/uImage does not exist since we are using packaged staging so we get
the error:
install: cannot stat `arch/arm/boot/uImage': No such file or directory
This patch only installs if not using packaged staging
---
classes/kernel.bbclass | 4 +++-
recipes/perl/perl-5.8.8/firsttime.patch | 15 +++++++++++++++
recipes/perl/perl-native_5.8.8.bb | 3 ++-
recipes/perl/perl_5.8.8.bb | 3 ++-
4 files changed, 22 insertions(+), 3 deletions(-)
create mode 100644 recipes/perl/perl-5.8.8/firsttime.patch
diff --git a/classes/kernel.bbclass b/classes/kernel.bbclass
index 53ea252..fa48a43 100644
--- a/classes/kernel.bbclass
+++ b/classes/kernel.bbclass
@@ -537,7 +537,9 @@ MODULES_IMAGE_BASE_NAME ?= modules-${PV}-${PR}-${MACHINE}
do_deploy() {
install -d ${DEPLOY_DIR_IMAGE}
- install -m 0644 ${KERNEL_OUTPUT} ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE_BASE_NAME}.bin
+ if [ "$PSTAGING_ACTIVE" = "0" ]; then
+ install -m 0644 ${KERNEL_OUTPUT} ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE_BASE_NAME}.bin
+ fi
package_stagefile_shell ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE_BASE_NAME}.bin
if [ -d "${PKGD}/lib" ]; then
diff --git a/recipes/perl/perl-5.8.8/firsttime.patch b/recipes/perl/perl-5.8.8/firsttime.patch
new file mode 100644
index 0000000..bd09589
--- /dev/null
+++ b/recipes/perl/perl-5.8.8/firsttime.patch
@@ -0,0 +1,15 @@
+Index: perl-5.8.8/lib/CPAN/FirstTime.pm
+===================================================================
+--- perl-5.8.8.orig/lib/CPAN/FirstTime.pm
++++ perl-5.8.8/lib/CPAN/FirstTime.pm
+@@ -68,9 +68,7 @@ dialog anytime later by typing 'o conf i
+
+ ];
+
+- my $manual_conf =
+- ExtUtils::MakeMaker::prompt("Are you ready for manual configuration?",
+- "yes");
++ my $manual_conf = "no";
+ my $fastread;
+ {
+ local $^W;
diff --git a/recipes/perl/perl-native_5.8.8.bb b/recipes/perl/perl-native_5.8.8.bb
index 60a5cf5..a9c66e8 100644
--- a/recipes/perl/perl-native_5.8.8.bb
+++ b/recipes/perl/perl-native_5.8.8.bb
@@ -15,7 +15,8 @@ SRC_URI = "http://ftp.funet.fi/pub/CPAN/src/perl-${PV}.tar.gz \
file://native-no-gdbminc.patch;patch=1 \
file://native-perlinc.patch;patch=1 \
file://makedepend-dash.patch;patch=1 \
- file://asm-pageh-fix.patch;patch=1"
+ file://asm-pageh-fix.patch;patch=1 \
+ file://firsttime.patch;patch=1"
S = "${WORKDIR}/perl-${PV}"
diff --git a/recipes/perl/perl_5.8.8.bb b/recipes/perl/perl_5.8.8.bb
index edd3a83..200e70c 100644
--- a/recipes/perl/perl_5.8.8.bb
+++ b/recipes/perl/perl_5.8.8.bb
@@ -5,7 +5,7 @@ LICENSE = "Artistic|GPL"
PRIORITY = "optional"
# We need gnugrep (for -I)
DEPENDS = "virtual/db perl-native grep-native"
-PR = "r31"
+PR = "r32"
# Major part of version
PVM = "5.8"
@@ -30,6 +30,7 @@ SRC_URI = "ftp://ftp.funet.fi/pub/CPAN/src/perl-${PV}.tar.gz \
file://64_debian_enc2xs_inc.patch;patch=1 \
file://asm-pageh-fix.patch;patch=1 \
file://shared-ldflags.patch;patch=1 \
+ file://firsttime.patch;patch=1 \
file://config.sh \
file://config.sh-32 \
file://config.sh-32-le \
--
1.6.4.2
More information about the Openembedded-devel
mailing list