summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--conf/distro/openslug-native-packages.conf3
-rw-r--r--conf/distro/openslug-native.conf15
-rw-r--r--conf/distro/openslug-packages.conf1
-rw-r--r--packages/dropbear/dropbear_0.46.bb8
-rw-r--r--packages/meta/openslug-native.bb7
-rw-r--r--packages/nonworking/iperf/.mtn2git_empty (renamed from packages/iperf/.mtn2git_empty)0
-rw-r--r--packages/nonworking/iperf/iperf-1.7.0/.mtn2git_empty (renamed from packages/iperf/iperf-1.7.0/.mtn2git_empty)0
-rw-r--r--packages/nonworking/iperf/iperf-1.7.0/socketaddr-h-errno.diff (renamed from packages/iperf/iperf-1.7.0/socketaddr-h-errno.diff)0
-rw-r--r--packages/nonworking/iperf/iperf_1.7.0.bb (renamed from packages/iperf/iperf_1.7.0.bb)0
-rw-r--r--packages/perl/perl-5.8.7/config.sh-i386-linux2
-rw-r--r--packages/perl/perl-5.8.7/config.sh-i686-linux2
-rw-r--r--packages/perl/perl_5.8.7.bb2
12 files changed, 28 insertions, 12 deletions
diff --git a/conf/distro/openslug-native-packages.conf b/conf/distro/openslug-native-packages.conf
index d4fedda6e2..de8d7f92a1 100644
--- a/conf/distro/openslug-native-packages.conf
+++ b/conf/distro/openslug-native-packages.conf
@@ -1,7 +1,8 @@
# automatically generated by bitbake freeze
BBFILES := "\
-${PKGDIR}/packages/vlan/*.bb \
${PKGDIR}/packages/gzip/*.bb \
+${PKGDIR}/packages/ipkg-utils/*.bb \
${PKGDIR}/packages/meta/*.bb \
+${PKGDIR}/packages/vlan/*.bb \
${OPENSLUG_EXTRA_BBFILES}"
# I don't know of any packages we currently need to compile nativly, so this is something to test with
diff --git a/conf/distro/openslug-native.conf b/conf/distro/openslug-native.conf
index a366aa7688..708bbf1360 100644
--- a/conf/distro/openslug-native.conf
+++ b/conf/distro/openslug-native.conf
@@ -2,9 +2,18 @@ include conf/distro/openslug.conf
# Corresponting packages should be in openslug-native.bb,
# currently missing: ipkg-utils libtool quilt pkgconfig
-ASSUME_PROVIDED = "libtool-cross libtool-native automake-native autoconf-native \
- quilt-native ipkg-utils-native gnu-config-native pkgconfig-native \
- virtual/armeb-linux-gcc virtual/libc update-rc.d"
+ASSUME_PROVIDED = "libtool-cross \
+ libtool-native \
+ automake-native \
+ autoconf-native \
+ quilt-native \
+ ipkg-native \
+ gnu-config-native \
+ pkgconfig-native \
+ virtual/armeb-linux-gcc \
+ virtual/libc \
+ update-rc.d \
+ "
# Our build host is armeb, not armv5eb that the kernel reports
BUILD_ARCH = armeb
diff --git a/conf/distro/openslug-packages.conf b/conf/distro/openslug-packages.conf
index 8719894e6a..25ea543f29 100644
--- a/conf/distro/openslug-packages.conf
+++ b/conf/distro/openslug-packages.conf
@@ -53,6 +53,7 @@ ${PKGDIR}/packages/gzip/*.bb \
${PKGDIR}/packages/hotplug-ng/*.bb \
${PKGDIR}/packages/initscripts/*.bb \
${PKGDIR}/packages/install/*.bb \
+${PKGDIR}/packages/iperf/*.bb \
${PKGDIR}/packages/ipkg-utils/*.bb \
${PKGDIR}/packages/ipkg/*.bb \
${PKGDIR}/packages/ircp/*.bb \
diff --git a/packages/dropbear/dropbear_0.46.bb b/packages/dropbear/dropbear_0.46.bb
index 739950ed1a..80373e3a1b 100644
--- a/packages/dropbear/dropbear_0.46.bb
+++ b/packages/dropbear/dropbear_0.46.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "http://matt.ucc.asn.au/dropbear/dropbear.html"
SECTION = "console/network"
LICENSE = "MIT"
DEPENDS = "zlib"
-PR = "r2"
+PR = "r3"
PROVIDES = "ssh sshd"
SRC_URI = "http://matt.ucc.asn.au/dropbear/releases/dropbear-${PV}.tar.bz2 \
@@ -41,10 +41,6 @@ do_install() {
${D}${localstatedir}
install -m 0755 dropbearmulti ${D}${sbindir}/
-# for i in ${BINCOMMANDS}
-# do
-# ln -s ${sbindir}/dropbearmulti ${D}${bindir}/$i
-# done
ln -s ${sbindir}/dropbearmulti ${D}${bindir}/dbclient
for i in ${SBINCOMMANDS}
@@ -71,4 +67,6 @@ pkg_postrm_append () {
if [ -f "${sysconfdir}/dropbear/dropbear_dss_host_key" ]; then
rm ${sysconfdir}/dropbear/dropbear_dss_host_key
fi
+ update-alternatives --remove ssh ${bindir}/dropbearmulti
+ update-alternatives --remove scp ${bindir}/dropbearmulti
}
diff --git a/packages/meta/openslug-native.bb b/packages/meta/openslug-native.bb
index bb5a68d01e..8530111b0f 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 = "r7"
+PR = "r9"
INHIBIT_DEFAULT_DEPS = "1"
ALLOW_EMPTY = 1
@@ -29,6 +29,7 @@ OPENSLUG_NATIVE = "\
libreadline4 libreadline-dev \
libstdc++-dev \
libthread-db1 \
+ libtool \
lrzsz \
m4 \
make \
@@ -36,7 +37,9 @@ OPENSLUG_NATIVE = "\
ncurses ncurses-dev ncurses-terminfo \
patch \
perl perl-modules \
- python-core python-io python-lang python-pickle python-shell python-textutils \
+ pkgconfig \
+ python-core python-crypt python-io python-lang python-pickle python-shell python-textutils \
+ quilt \
sed \
tar \
util-linux \
diff --git a/packages/iperf/.mtn2git_empty b/packages/nonworking/iperf/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/iperf/.mtn2git_empty
+++ b/packages/nonworking/iperf/.mtn2git_empty
diff --git a/packages/iperf/iperf-1.7.0/.mtn2git_empty b/packages/nonworking/iperf/iperf-1.7.0/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/iperf/iperf-1.7.0/.mtn2git_empty
+++ b/packages/nonworking/iperf/iperf-1.7.0/.mtn2git_empty
diff --git a/packages/iperf/iperf-1.7.0/socketaddr-h-errno.diff b/packages/nonworking/iperf/iperf-1.7.0/socketaddr-h-errno.diff
index 15b1bc2928..15b1bc2928 100644
--- a/packages/iperf/iperf-1.7.0/socketaddr-h-errno.diff
+++ b/packages/nonworking/iperf/iperf-1.7.0/socketaddr-h-errno.diff
diff --git a/packages/iperf/iperf_1.7.0.bb b/packages/nonworking/iperf/iperf_1.7.0.bb
index ef075e8c8a..ef075e8c8a 100644
--- a/packages/iperf/iperf_1.7.0.bb
+++ b/packages/nonworking/iperf/iperf_1.7.0.bb
diff --git a/packages/perl/perl-5.8.7/config.sh-i386-linux b/packages/perl/perl-5.8.7/config.sh-i386-linux
index fda13d0d9b..3996011a2b 100644
--- a/packages/perl/perl-5.8.7/config.sh-i386-linux
+++ b/packages/perl/perl-5.8.7/config.sh-i386-linux
@@ -435,6 +435,8 @@ d_strerrm='strerror(e)'
d_strerror='define'
d_strerror_r='undef'
d_strftime='define'
+d_strlcat='undef'
+d_strlcpy='undef'
d_strtod='define'
d_strtol='define'
d_strtold='define'
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 313ff2fbb1..0ea1826f3a 100644
--- a/packages/perl/perl-5.8.7/config.sh-i686-linux
+++ b/packages/perl/perl-5.8.7/config.sh-i686-linux
@@ -435,6 +435,8 @@ d_strerrm='strerror(e)'
d_strerror='define'
d_strerror_r='undef'
d_strftime='define'
+d_strlcat='undef'
+d_strlcpy='undef'
d_strtod='define'
d_strtol='define'
d_strtold='define'
diff --git a/packages/perl/perl_5.8.7.bb b/packages/perl/perl_5.8.7.bb
index 3500ca57bd..630c126bc2 100644
--- a/packages/perl/perl_5.8.7.bb
+++ b/packages/perl/perl_5.8.7.bb
@@ -5,7 +5,7 @@ include perl.inc
SRC_URI += "file://config.sh-armeb-linux \
file://config.sh-i386-linux"
-PR = "r10"
+PR = "r11"
do_configure() {
ln -sf ${HOSTPERL} ${STAGING_BINDIR}/hostperl
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-17 01:40:27 +0000