summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--conf/distro/openslug-packages.conf2
-rw-r--r--conf/distro/openslug.conf5
-rw-r--r--packages/gzip/gzip_1.3.5.bb23
-rwxr-xr-xpackages/initscripts/initscripts-1.0/populate-volatile.sh168
-rw-r--r--packages/initscripts/initscripts-openslug_1.0.bb4
-rw-r--r--packages/initscripts/initscripts_1.0.bb7
-rw-r--r--packages/ixp425-eth/ixp425-eth_1.1.bb21
-rw-r--r--packages/meta/openslug-native.bb3
-rw-r--r--packages/nis/pwdutils_2.6.bb2
-rw-r--r--packages/nis/ypbind-mt_1.18.bb2
-rw-r--r--packages/nis/ypserv_2.17.bb2
-rw-r--r--packages/pam/libpam_0.79.bb9
-rw-r--r--packages/perl/perl-5.8.7/config.sh-arm-linux.patch9
-rw-r--r--packages/perl/perl-5.8.7/config.sh-armeb-linux2
-rw-r--r--packages/perl/perl-5.8.7/config.sh-i686-linux2
-rw-r--r--packages/perl/perl_5.8.7.bb3
16 files changed, 188 insertions, 76 deletions
diff --git a/conf/distro/openslug-packages.conf b/conf/distro/openslug-packages.conf
index 5972afdbf0..11b778db9f 100644
--- a/conf/distro/openslug-packages.conf
+++ b/conf/distro/openslug-packages.conf
@@ -157,4 +157,4 @@ ${PKGDIR}/packages/vlan/*.bb \
${PKGDIR}/packages/wget/*.bb \
${PKGDIR}/packages/xinetd/*.bb \
${PKGDIR}/packages/zlib/*.bb \
-"
+${OPENSLUG_EXTRA_BBFILES}"
diff --git a/conf/distro/openslug.conf b/conf/distro/openslug.conf
index dd4d7c0b5b..4c22206a49 100644
--- a/conf/distro/openslug.conf
+++ b/conf/distro/openslug.conf
@@ -36,6 +36,11 @@ EXTRA_IMAGECMD_jffs2 = "--pad --big-endian --eraseblock=0x20000 -D ${OPENSLUG_DE
OPENSLUG_EXTRA_DEPENDS ?= "e2fsprogs reiserfsprogs upslug-native lrzsz"
+# NOTE: to build new packages set OPENSLUG_EXTRA_BBFILES to the full path name to
+# the .bb files for the packages to build - see openslug-packages.conf in this
+# directory
+OPENSLUG_EXTRA_BBFILES ?= ""
+
# CMDLINE* macros define the kernel command line. CMDLINE_DEBUG is provided
# to enable/disable debugging in the distro. Here noirqdebug is used to
# remove the messages about unhandled interrupts - people debugging interrupt
diff --git a/packages/gzip/gzip_1.3.5.bb b/packages/gzip/gzip_1.3.5.bb
index e99c76dcb4..a138221367 100644
--- a/packages/gzip/gzip_1.3.5.bb
+++ b/packages/gzip/gzip_1.3.5.bb
@@ -5,6 +5,7 @@ MAINTAINER = "Greg Gilbert <greg@treke.net>"
DESCRIPTION = "gzip (GNU zip) is a compression utility designed \
to be a replacement for 'compress'. The GNU Project uses it as \
the standard compression program for its system."
+PR = "r1"
SRC_URI = "${DEBIAN_MIRROR}/main/g/gzip/gzip_${PV}.orig.tar.gz \
file://configure.patch;patch=1"
@@ -12,3 +13,25 @@ SRC_URI = "${DEBIAN_MIRROR}/main/g/gzip/gzip_${PV}.orig.tar.gz \
S = "${WORKDIR}/gzip-${PV}"
inherit autotools
+
+do_install () {
+ autotools_do_install
+ # Rename and move files into /bin (FHS)
+ install -d ${D}${base_bindir}
+ mv ${D}${bindir}/gunzip ${D}${base_bindir}/gunzip.${PN}
+ mv ${D}${bindir}/gzip ${D}${base_bindir}/gzip.${PN}
+ mv ${D}${bindir}/zcat ${D}${base_bindir}/zcat.${PN}
+}
+
+pkg_postinst_${PN} () {
+ update-alternatives --install ${base_bindir}/gunzip gunzip gunzip.${PN} 100
+ update-alternatives --install ${base_bindir}/gzip gzip gzip.${PN} 100
+ update-alternatives --install ${base_bindir}/zcat zcat zcat.${PN} 100
+}
+
+pkg_prerm_${PN} () {
+ update-alternatives --remove gunzip gunzip.${PN}
+ update-alternatives --remove gzip gzip.${PN}
+ update-alternatives --remove zcat zcat.${PN}
+}
+
diff --git a/packages/initscripts/initscripts-1.0/populate-volatile.sh b/packages/initscripts/initscripts-1.0/populate-volatile.sh
index 311a2764da..99a469d576 100755
--- a/packages/initscripts/initscripts-1.0/populate-volatile.sh
+++ b/packages/initscripts/initscripts-1.0/populate-volatile.sh
@@ -1,64 +1,138 @@
#!/bin/sh
. /etc/default/rcS
-CFGFILE="/etc/default/volatiles"
+
+CFGDIR="/etc/default/volatiles"
+TMPROOT="/var/tmp"
+COREDEF="00_core"
[ "${VERBOSE}" != "no" ] && echo "Populating volatile Filesystems."
-cat ${CFGFILE} | grep -v "^#" | \
-while read LINE; do
- TTYPE=`echo ${LINE} | cut -d " " -f 1`
- TUSER=`echo ${LINE} | cut -d " " -f 2`
- TGROUP=`echo ${LINE} | cut -d " " -f 3`
- TMODE=`echo ${LINE} | cut -d " " -f 4`
- TNAME=`echo ${LINE} | cut -d " " -f 5`
- [ "${VERBOSE}" != "no" ] && echo "Checking for -${TNAME}-."
+check_requirements() {
- [ "${TTYPE}" = "l" ] && {
- [ -e "${TNAME}" ] && {
- echo "Cannot create link over existing -${TNAME}-." >&2
- } || {
- TSOURCE=`echo ${LINE} | cut -d " " -f 6`
- [ "${VERBOSE}" != "no" ] && echo "Creating link -${TNAME}- pointing to -${TSOURCE}-."
- ln -s "${TSOURCE}" "${TNAME}"
- }
- continue
+ cleanup() {
+ rm "${TMP_INTERMED}"
+ rm "${TMP_DEFINED}"
+ rm "${TMP_COMBINED}"
}
+
+ CFGFILE="$1"
- [ -L "${TNAME}" ] && {
- [ "${VERBOSE}" != "no" ] && echo "Found link."
- NEWNAME=`ls -l "${TNAME}" | sed -e 's/^.*-> \(.*\)$/\1/'`
- echo ${NEWNAME} | grep -v "^/" >/dev/null && {
- TNAME="`echo ${TNAME} | sed -e 's@\(.*\)/.*@\1@'`/${NEWNAME}"
- [ "${VERBOSE}" != "no" ] && echo "Converted relative linktarget to absolute path -${TNAME}-."
- } || {
- TNAME="${NEWNAME}"
- [ "${VERBOSE}" != "no" ] && echo "Using absolute link target -${TNAME}-."
- }
+ [ `basename "${CFGFILE}"` = "${COREDEF}" ] && return 0
+
+ TMP_INTERMED="${TMPROOT}/tmp.$$"
+ TMP_DEFINED="${TMPROOT}/tmpdefined.$$"
+ TMP_COMBINED="${TMPROOT}/tmpcombined.$$"
+
+
+ cat /etc/passwd | sed 's@\(^:\)*:.*@\1@' | sort | uniq > "${TMP_DEFINED}"
+ cat ${CFGFILE} | grep -v "^#" | cut -d " " -f 2 > "${TMP_INTERMED}"
+ cat "${TMP_DEFINED}" "${TMP_INTERMED}" | sort | uniq > "${TMP_COMBINED}"
+
+ NR_DEFINED_USERS="`cat "${TMP_DEFINED}" | wc -l`"
+ NR_COMBINED_USERS="`cat "${TMP_COMBINED}" | wc -l`"
+
+ [ "${NR_DEFINED_USERS}" -ne "${NR_COMBINED_USERS}" ] && {
+ echo "Undefined users:"
+ diff "${TMP_DEFINED}" "${TMP_COMBINED}" | grep "^>"
+ cleanup
+ return 1
+ }
+
+
+ cat /etc/group | sed 's@\(^:\)*:.*@\1@' | sort | uniq > "${TMP_DEFINED}"
+ cat ${CFGFILE} | grep -v "^#" | cut -d " " -f 3 > "${TMP_INTERMED}"
+ cat "${TMP_DEFINED}" "${TMP_INTERMED}" | sort | uniq > "${TMP_COMBINED}"
+
+ NR_DEFINED_GROUPS="`cat "${TMP_DEFINED}" | wc -l`"
+ NR_COMBINED_GROUPS="`cat "${TMP_COMBINED}" | wc -l`"
+
+ [ "${NR_DEFINED_GROUPS}" -ne "${NR_COMBINED_GROUPS}" ] && {
+ echo "Undefined groups:"
+ diff "${TMP_DEFINED}" "${TMP_COMBINED}" | grep "^>"
+ cleanup
+ return 1
}
- [ -e "${TNAME}" ] && {
- [ "${VERBOSE}" != "no" ] && echo "Target already exists. Skipping."
- continue
+ # Add checks for required directories here
+
+ cleanup
+ return 0
+ }
+
+apply_cfgfile() {
+
+ CFGFILE="$1"
+
+ check_requirements "${CFGFILE}" || {
+ echo "Skipping ${CFGFILE}"
+ return 1
}
- case "${TTYPE}" in
- "f") [ "${VERBOSE}" != "no" ] && echo "Creating file -${TNAME}-."
- touch "${TNAME}"
- ;;
- "d") [ "${VERBOSE}" != "no" ] && echo "Creating directory -${TNAME}-."
- mkdir -p "${TNAME}"
- # Add check to see if there's an entry in fstab to mount.
- ;;
- *) [ "${VERBOSE}" != "no" ] && echo "Invalid type -${TTYPE}-."
- continue
- ;;
- esac
-
- chown ${TUSER} ${TNAME} || echo "Failed to set owner -${TUSER}- for -${TNAME}-." >&2
- chgrp ${TGROUP} ${TNAME} || echo "Failed to set group -${TGROUP}- for -${TNAME}-." >&2
- chmod ${TMODE} ${TNAME} || echo "Failed to set mode -${TMODE}- for -${TNAME}-." >&2
+ cat ${CFGFILE} | grep -v "^#" | \
+ while read LINE; do
+ TTYPE=`echo ${LINE} | cut -d " " -f 1`
+ TUSER=`echo ${LINE} | cut -d " " -f 2`
+ TGROUP=`echo ${LINE} | cut -d " " -f 3`
+ TMODE=`echo ${LINE} | cut -d " " -f 4`
+ TNAME=`echo ${LINE} | cut -d " " -f 5`
+
+ [ "${VERBOSE}" != "no" ] && echo "Checking for -${TNAME}-."
+
+ [ "${TTYPE}" = "l" ] && {
+ [ -e "${TNAME}" ] && {
+ echo "Cannot create link over existing -${TNAME}-." >&2
+ } || {
+ TSOURCE=`echo ${LINE} | cut -d " " -f 6`
+ [ "${VERBOSE}" != "no" ] && echo "Creating link -${TNAME}- pointing to -${TSOURCE}-."
+ ln -s "${TSOURCE}" "${TNAME}"
+ }
+ continue
+ }
+
+ [ -L "${TNAME}" ] && {
+ [ "${VERBOSE}" != "no" ] && echo "Found link."
+ NEWNAME=`ls -l "${TNAME}" | sed -e 's/^.*-> \(.*\)$/\1/'`
+ echo ${NEWNAME} | grep -v "^/" >/dev/null && {
+ TNAME="`echo ${TNAME} | sed -e 's@\(.*\)/.*@\1@'`/${NEWNAME}"
+ [ "${VERBOSE}" != "no" ] && echo "Converted relative linktarget to absolute path -${TNAME}-."
+ } || {
+ TNAME="${NEWNAME}"
+ [ "${VERBOSE}" != "no" ] && echo "Using absolute link target -${TNAME}-."
+ }
+ }
+
+ [ -e "${TNAME}" ] && {
+ [ "${VERBOSE}" != "no" ] && echo "Target already exists. Skipping."
+ continue
+ }
+
+ case "${TTYPE}" in
+ "f") [ "${VERBOSE}" != "no" ] && echo "Creating file -${TNAME}-."
+ touch "${TNAME}"
+ ;;
+ "d") [ "${VERBOSE}" != "no" ] && echo "Creating directory -${TNAME}-."
+ mkdir -p "${TNAME}"
+ # Add check to see if there's an entry in fstab to mount.
+ ;;
+ *) [ "${VERBOSE}" != "no" ] && echo "Invalid type -${TTYPE}-."
+ continue
+ ;;
+ esac
+
+ chown ${TUSER} ${TNAME} || echo "Failed to set owner -${TUSER}- for -${TNAME}-." >&2
+ chgrp ${TGROUP} ${TNAME} || echo "Failed to set group -${TGROUP}- for -${TNAME}-." >&2
+ chmod ${TMODE} ${TNAME} || echo "Failed to set mode -${TMODE}- for -${TNAME}-." >&2
+
+ done
+
+ return 0
+
+ }
+
+for file in `ls -1 "${CFGDIR}" | sort`; do
+ apply_cfgfile "${CFGDIR}/${file}"
done
diff --git a/packages/initscripts/initscripts-openslug_1.0.bb b/packages/initscripts/initscripts-openslug_1.0.bb
index b5252bfdeb..4e82022876 100644
--- a/packages/initscripts/initscripts-openslug_1.0.bb
+++ b/packages/initscripts/initscripts-openslug_1.0.bb
@@ -11,7 +11,7 @@ RCONFLICTS = "initscripts"
# All other standard definitions inherited from initscripts
# Except the PR which is hacked here. The format used is
# a suffix
-PR := "${PR}.2"
+PR := "${PR}.3"
FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/${P}', '${FILE_DIRNAME}/initscripts-${PV}', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
@@ -96,7 +96,7 @@ do_install_append() {
# checkfs.sh is currently disabled from S 30 (and won't work on OpenSlug)
# ramdisk is not used on OpenSlug, would run at S 30
update-rc.d -r ${D} mountall.sh start 35 S .
- # base-files populate-var.sh runs at S37
+ # base-files populate-volatile.sh runs at S37
update-rc.d -r ${D} devpts.sh start 38 S .
# openslug file syslog starts here (39)
diff --git a/packages/initscripts/initscripts_1.0.bb b/packages/initscripts/initscripts_1.0.bb
index 76755e1744..5e7d6fe44c 100644
--- a/packages/initscripts/initscripts_1.0.bb
+++ b/packages/initscripts/initscripts_1.0.bb
@@ -6,7 +6,7 @@ DEPENDS = "makedevs"
DEPENDS_openzaurus = "makedevs virtual/kernel"
RDEPENDS = "makedevs"
LICENSE = "GPL"
-PR = "r51"
+PR = "r52"
SRC_URI = "file://halt \
file://ramdisk \
@@ -66,7 +66,8 @@ do_install () {
${D}${sysconfdir}/rc4.d \
${D}${sysconfdir}/rc5.d \
${D}${sysconfdir}/rc6.d \
- ${D}${sysconfdir}/default
+ ${D}${sysconfdir}/default \
+ ${D}${sysconfdir}/default/volatiles
install -m 0755 ${WORKDIR}/bootmisc.sh ${D}${sysconfdir}/init.d
install -m 0755 ${WORKDIR}/checkroot.sh ${D}${sysconfdir}/init.d
@@ -86,7 +87,7 @@ do_install () {
install -m 0755 ${WORKDIR}/devpts ${D}${sysconfdir}/default
install -m 0755 ${WORKDIR}/sysfs.sh ${D}${sysconfdir}/init.d
install -m 0755 ${WORKDIR}/populate-volatile.sh ${D}${sysconfdir}/init.d
- install -m 0644 ${WORKDIR}/volatiles ${D}${sysconfdir}/default
+ install -m 0644 ${WORKDIR}/volatiles ${D}${sysconfdir}/default/volatiles/00_core
if [ "${TARGET_ARCH}" = "arm" ]; then
install -m 0755 ${WORKDIR}/alignment.sh ${D}${sysconfdir}/init.d
fi
diff --git a/packages/ixp425-eth/ixp425-eth_1.1.bb b/packages/ixp425-eth/ixp425-eth_1.1.bb
index 9225cb3df7..a8be7757c3 100644
--- a/packages/ixp425-eth/ixp425-eth_1.1.bb
+++ b/packages/ixp425-eth/ixp425-eth_1.1.bb
@@ -2,12 +2,13 @@ DEPENDS = "ixp4xx-csr patcher-native"
LICENSE = "GPL"
MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
SRC_URI = "http://www.intel.com/design/network/swsup/ixp400LinuxEthernetDriverPatch-1_1.zip \
+ http://nslu.sourceforge.net/downloads/ixp425_eth.c.patch \
file://makefile.patch;patch=1 \
file://ethhdr.patch;patch=1 \
file://intdriven.patch;patch=1 \
file://pollcontroller.patch;patch=1 \
file://mm4.patch;patch=1"
-PR = "r5"
+PR = "r6"
S = "${WORKDIR}"
@@ -21,15 +22,15 @@ inherit module
KERNEL_CC += "${TARGET_CC_ARCH} -mno-thumb-interwork"
# KERNEL_LD +=
-do_ixp425_c_patch_fetch () {
- if test ! -e ${DL_DIR}/ixp425_eth.c.patch.md5; then
- cd ${DL_DIR}
- wget -Oixp425_eth.c.patch http://sourceforge.net/tracker/download.php?group_id=74209\&atid=544386\&file_id=90129\&aid=970193
- md5sum > ixp425_eth.c.patch.md5
- fi
-}
-
-addtask ixp425_c_patch_fetch after do_fetch before do_unpack
+#do_ixp425_c_patch_fetch () {
+# if test ! -e ${DL_DIR}/ixp425_eth.c.patch.md5; then
+# cd ${DL_DIR}
+# wget -Oixp425_eth.c.patch http://sourceforge.net/tracker/download.php?group_id=74209\&atid=544386\&file_id=90129\&aid=970193
+# md5sum > ixp425_eth.c.patch.md5
+# fi
+#}
+#
+#addtask ixp425_c_patch_fetch after do_fetch before do_unpack
do_ixp425_c_patch_unpack () {
install -m 0644 ${DL_DIR}/ixp425_eth.c.patch ${WORKDIR}/
diff --git a/packages/meta/openslug-native.bb b/packages/meta/openslug-native.bb
index d61815eb6a..bb5a68d01e 100644
--- a/packages/meta/openslug-native.bb
+++ b/packages/meta/openslug-native.bb
@@ -1,6 +1,6 @@
DESCRIPTION = "Packages that are required for the OpenSlug native build environment"
LICENSE = MIT
-PR = "r6"
+PR = "r7"
INHIBIT_DEFAULT_DEPS = "1"
ALLOW_EMPTY = 1
@@ -21,6 +21,7 @@ OPENSLUG_NATIVE = "\
gcc gcc-symlinks \
glibc-extra-nss glibc-utils \
gnu-config \
+ gzip \
libc6 libc6-dev \
libg2c-dev \
libgdbm3 \
diff --git a/packages/nis/pwdutils_2.6.bb b/packages/nis/pwdutils_2.6.bb
index 4ba89ffb23..4db798c151 100644
--- a/packages/nis/pwdutils_2.6.bb
+++ b/packages/nis/pwdutils_2.6.bb
@@ -12,6 +12,8 @@ HOMEPAGE="http://lists.suse.com/archive/pwdutils/"
include nis.inc
+SRC_URI = "ftp://ftp.kernel.org/pub/linux/utils/net/NIS/OLD/${PN}/${P}.tar.bz2"
+
# an selinux API is used even if no selinux is detected by
# configure.
SRC_URI += " file://no-selinux.patch;patch=1"
diff --git a/packages/nis/ypbind-mt_1.18.bb b/packages/nis/ypbind-mt_1.18.bb
index e58daa6670..fb6b0b3621 100644
--- a/packages/nis/ypbind-mt_1.18.bb
+++ b/packages/nis/ypbind-mt_1.18.bb
@@ -16,6 +16,8 @@ HOMEPAGE="http://www.linux-nis.org/nis/ypbind-mt/index.html"
include nis.inc
+SRC_URI = "ftp://ftp.kernel.org/pub/linux/utils/net/NIS/OLD/${PN}/${P}.tar.bz2"
+
# ypbind-mt now provides all the functionality of ypbind
# and is used in place of it.
PROVIDES += "ypbind"
diff --git a/packages/nis/ypserv_2.17.bb b/packages/nis/ypserv_2.17.bb
index 6edb534e8f..c6c564bd50 100644
--- a/packages/nis/ypserv_2.17.bb
+++ b/packages/nis/ypserv_2.17.bb
@@ -7,6 +7,8 @@ HOMEPAGE="http://www.linux-nis.org/nis/ypserv/index.html"
include nis.inc
+SRC_URI = "ftp://ftp.kernel.org/pub/linux/utils/net/NIS/OLD/${PN}/${P}.tar.bz2"
+
# ypserv needs a database package, gdbm is currently the
# only candidate
DEPENDS += " gdbm"
diff --git a/packages/pam/libpam_0.79.bb b/packages/pam/libpam_0.79.bb
index 8907d9762a..b2fb9deb8f 100644
--- a/packages/pam/libpam_0.79.bb
+++ b/packages/pam/libpam_0.79.bb
@@ -19,6 +19,7 @@ MAINTAINER = "John Bowler <jbowler@acm.org>"
SECTION = "libs"
PRIORITY = "optional"
LICENSE = "GPL-2"
+PR = "r1"
# The project is actually called Linux-PAM but that gives
# a bad OE package name because of the upper case characters
@@ -37,6 +38,14 @@ SRC_URI += " file://libpam-make.patch;patch=1"
inherit autotools
# EXTRA_OECONF += " --enable-static-libpam"
+# Disable building of the documentation - it requires too many different
+# programs installed on the build system and is a waste of time. This
+# leaves the man documentation in the build.
+EXTRA_OECONF += "ac_cv_prog_HAVE_SGML2TXT=no"
+EXTRA_OECONF += "ac_cv_prog_HAVE_SGML2HTML=no"
+EXTRA_OECONF += "ac_cv_prog_HAVE_SGML2LATEX=no"
+EXTRA_OECONF += "ac_cv_prog_HAVE_PS2PDF=no"
+EXTRA_OECONF += "ac_cv_prog_HAVE_SGML2PS=no"
LEAD_SONAME = "libpam.so.*"
diff --git a/packages/perl/perl-5.8.7/config.sh-arm-linux.patch b/packages/perl/perl-5.8.7/config.sh-arm-linux.patch
index 0f56601b8b..0181e37c95 100644
--- a/packages/perl/perl-5.8.7/config.sh-arm-linux.patch
+++ b/packages/perl/perl-5.8.7/config.sh-arm-linux.patch
@@ -24,15 +24,6 @@
pg='pg'
phostname='hostname'
pidtype='pid_t'
-@@ -906,7 +907,7 @@
- srandom_r_proto='0'
- src='.'
- ssizetype='ssize_t'
--startperl='#!/usr/bin/perl'
-+startperl='#!hostperl'
- startsh='#!/bin/sh'
- static_ext=' '
- stdchar='char'
@@ -971,6 +972,7 @@
usereentrant='undef'
usesfio='false'
diff --git a/packages/perl/perl-5.8.7/config.sh-armeb-linux b/packages/perl/perl-5.8.7/config.sh-armeb-linux
index 3c5adaf70b..155b5237aa 100644
--- a/packages/perl/perl-5.8.7/config.sh-armeb-linux
+++ b/packages/perl/perl-5.8.7/config.sh-armeb-linux
@@ -907,7 +907,7 @@ srand48_r_proto='0'
srandom_r_proto='0'
src='.'
ssizetype='ssize_t'
-startperl='#!hostperl'
+startperl='#!/usr/bin/perl'
startsh='#!/bin/sh'
static_ext=' '
stdchar='char'
diff --git a/packages/perl/perl-5.8.7/config.sh-i686-linux b/packages/perl/perl-5.8.7/config.sh-i686-linux
index b09b7140e7..313ff2fbb1 100644
--- a/packages/perl/perl-5.8.7/config.sh-i686-linux
+++ b/packages/perl/perl-5.8.7/config.sh-i686-linux
@@ -905,7 +905,7 @@ srand48_r_proto='0'
srandom_r_proto='0'
src='.'
ssizetype='ssize_t'
-startperl='#!hostperl'
+startperl='#!/usr/bin/perl'
startsh='#!/bin/sh'
static_ext=' '
stdchar='char'
diff --git a/packages/perl/perl_5.8.7.bb b/packages/perl/perl_5.8.7.bb
index 7d79105065..babeea3e9a 100644
--- a/packages/perl/perl_5.8.7.bb
+++ b/packages/perl/perl_5.8.7.bb
@@ -4,7 +4,7 @@ include perl.inc
SRC_URI += "file://config.sh-armeb-linux"
-PR = "r7"
+PR = "r9"
do_configure() {
ln -sf ${HOSTPERL} ${STAGING_BINDIR}/hostperl
@@ -30,6 +30,7 @@ do_configure() {
do_install_append() {
ln -s libperl.so.${PV} ${D}/${libdir}/libperl.so.5
+ sed -i -e "s,${D},,g" ${D}/${libdir}/perl5/${PV}/${TARGET_ARCH}-${TARGET_OS}/Config_heavy.pl
}
# Create a perl-modules package recommending all the other perl