From c7783ddc512329ad46631de44c0ae40987a4a8a6 Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Mon, 1 Aug 2005 00:36:25 +0000 Subject: Let openslug-native build ipkg-utils-native, for use in packaging. --- conf/distro/openslug-native.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/distro/openslug-native.conf b/conf/distro/openslug-native.conf index a366aa7688..ce56d88672 100644 --- a/conf/distro/openslug-native.conf +++ b/conf/distro/openslug-native.conf @@ -3,7 +3,7 @@ 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 \ + quilt-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 -- cgit v1.2.3 From 20c8bf3d14ad0dce45fd6784d44bcb419ca2699a Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Mon, 1 Aug 2005 00:38:40 +0000 Subject: Removed ipkg-utils-native from openslug-native.conf --- conf/distro/openslug-native.conf | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/conf/distro/openslug-native.conf b/conf/distro/openslug-native.conf index ce56d88672..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 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 -- cgit v1.2.3 From b9aae80edfbbea5086466d20256135ebfd631bc9 Mon Sep 17 00:00:00 2001 From: Oyvind Repvik Date: Wed, 3 Aug 2005 12:48:32 +0000 Subject: Move iperf to nonworking --- packages/iperf/.mtn2git_empty | 0 packages/iperf/iperf-1.7.0/.mtn2git_empty | 0 packages/iperf/iperf-1.7.0/socketaddr-h-errno.diff | 11 --------- packages/iperf/iperf_1.7.0.bb | 27 ---------------------- packages/nonworking/iperf/.mtn2git_empty | 0 .../nonworking/iperf/iperf-1.7.0/.mtn2git_empty | 0 .../iperf/iperf-1.7.0/socketaddr-h-errno.diff | 11 +++++++++ packages/nonworking/iperf/iperf_1.7.0.bb | 27 ++++++++++++++++++++++ 8 files changed, 38 insertions(+), 38 deletions(-) delete mode 100644 packages/iperf/.mtn2git_empty delete mode 100644 packages/iperf/iperf-1.7.0/.mtn2git_empty delete mode 100644 packages/iperf/iperf-1.7.0/socketaddr-h-errno.diff delete mode 100644 packages/iperf/iperf_1.7.0.bb create mode 100644 packages/nonworking/iperf/.mtn2git_empty create mode 100644 packages/nonworking/iperf/iperf-1.7.0/.mtn2git_empty create mode 100644 packages/nonworking/iperf/iperf-1.7.0/socketaddr-h-errno.diff create mode 100644 packages/nonworking/iperf/iperf_1.7.0.bb diff --git a/packages/iperf/.mtn2git_empty b/packages/iperf/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/iperf/iperf-1.7.0/.mtn2git_empty b/packages/iperf/iperf-1.7.0/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/iperf/iperf-1.7.0/socketaddr-h-errno.diff b/packages/iperf/iperf-1.7.0/socketaddr-h-errno.diff deleted file mode 100644 index 15b1bc2928..0000000000 --- a/packages/iperf/iperf-1.7.0/socketaddr-h-errno.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- lib/SocketAddr.cpp.orig 2004-10-05 12:10:06.763746800 +0200 -+++ lib/SocketAddr.cpp 2004-10-05 12:10:21.079570464 +0200 -@@ -65,7 +65,7 @@ - - - #ifndef WIN32 --extern int h_errno; -+//extern int h_errno; - #endif - - Socklen_t SocketAddr::mAddress_size = sizeof(iperf_sockaddr); diff --git a/packages/iperf/iperf_1.7.0.bb b/packages/iperf/iperf_1.7.0.bb deleted file mode 100644 index ef075e8c8a..0000000000 --- a/packages/iperf/iperf_1.7.0.bb +++ /dev/null @@ -1,27 +0,0 @@ -SECTION = "console/network" -DESCRIPTION = "Iperf is a tool to measure maximum TCP bandwidth, allowing the tuning of various parameters and UDP characteristics" -HOMEPAGE = "http://dast.nlanr.net/Projects/Iperf/" -LICENSE = "BSD" -MAINTAINER = "Bruno Randolf " - -SRC_URI = "http://dast.nlanr.net/Projects/Iperf/iperf-${PV}-source.tar.gz \ - file://socketaddr-h-errno.diff;patch=1;pnum=0" - -inherit autotools - -S="${WORKDIR}/iperf-${PV}/cfg" -PATCHES_DIR="${WORKDIR}/iperf-${PV}" - -do_configure() { - oe_runconf -} - -do_compile() { - cd ${WORKDIR}/iperf-${PV} - oe_runmake -} - -do_install() { - cd ${WORKDIR}/iperf-${PV}/src - oe_runmake INSTALL_DIR=${D}${bindir} install -} diff --git a/packages/nonworking/iperf/.mtn2git_empty b/packages/nonworking/iperf/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/nonworking/iperf/iperf-1.7.0/.mtn2git_empty b/packages/nonworking/iperf/iperf-1.7.0/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/nonworking/iperf/iperf-1.7.0/socketaddr-h-errno.diff b/packages/nonworking/iperf/iperf-1.7.0/socketaddr-h-errno.diff new file mode 100644 index 0000000000..15b1bc2928 --- /dev/null +++ b/packages/nonworking/iperf/iperf-1.7.0/socketaddr-h-errno.diff @@ -0,0 +1,11 @@ +--- lib/SocketAddr.cpp.orig 2004-10-05 12:10:06.763746800 +0200 ++++ lib/SocketAddr.cpp 2004-10-05 12:10:21.079570464 +0200 +@@ -65,7 +65,7 @@ + + + #ifndef WIN32 +-extern int h_errno; ++//extern int h_errno; + #endif + + Socklen_t SocketAddr::mAddress_size = sizeof(iperf_sockaddr); diff --git a/packages/nonworking/iperf/iperf_1.7.0.bb b/packages/nonworking/iperf/iperf_1.7.0.bb new file mode 100644 index 0000000000..ef075e8c8a --- /dev/null +++ b/packages/nonworking/iperf/iperf_1.7.0.bb @@ -0,0 +1,27 @@ +SECTION = "console/network" +DESCRIPTION = "Iperf is a tool to measure maximum TCP bandwidth, allowing the tuning of various parameters and UDP characteristics" +HOMEPAGE = "http://dast.nlanr.net/Projects/Iperf/" +LICENSE = "BSD" +MAINTAINER = "Bruno Randolf " + +SRC_URI = "http://dast.nlanr.net/Projects/Iperf/iperf-${PV}-source.tar.gz \ + file://socketaddr-h-errno.diff;patch=1;pnum=0" + +inherit autotools + +S="${WORKDIR}/iperf-${PV}/cfg" +PATCHES_DIR="${WORKDIR}/iperf-${PV}" + +do_configure() { + oe_runconf +} + +do_compile() { + cd ${WORKDIR}/iperf-${PV} + oe_runmake +} + +do_install() { + cd ${WORKDIR}/iperf-${PV}/src + oe_runmake INSTALL_DIR=${D}${bindir} install +} -- cgit v1.2.3 From 240cb09c9bdd8ddfabbadfa322ffe008538f75a9 Mon Sep 17 00:00:00 2001 From: David Karlstrom Date: Wed, 3 Aug 2005 13:28:49 +0000 Subject: Add missing defines for the i386 and i686 config.sh --- packages/perl/perl-5.8.7/config.sh-i386-linux | 2 ++ packages/perl/perl-5.8.7/config.sh-i686-linux | 2 ++ 2 files changed, 4 insertions(+) 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' -- cgit v1.2.3 From f1700707e86caa475006ef21194376107e3f28f9 Mon Sep 17 00:00:00 2001 From: David Karlstrom Date: Wed, 3 Aug 2005 13:29:36 +0000 Subject: Oh right, bump the PR... --- packages/perl/perl_5.8.7.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 -- cgit v1.2.3 From d1bcf7aa9c4c1599f15ef8a869be0efe24e61093 Mon Sep 17 00:00:00 2001 From: David Karlstrom Date: Wed, 3 Aug 2005 14:03:31 +0000 Subject: Add ipkg-native to ASSUME_PROVIDED on openslug-native --- conf/distro/openslug-native.conf | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/conf/distro/openslug-native.conf b/conf/distro/openslug-native.conf index a366aa7688..ccb169d0f8 100644 --- a/conf/distro/openslug-native.conf +++ b/conf/distro/openslug-native.conf @@ -2,9 +2,19 @@ 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-utils-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 -- cgit v1.2.3 From 97173d7ca3a6a34a774e443455faa3d5838e5844 Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Mon, 1 Aug 2005 00:51:26 +0000 Subject: Added ipkg-utils to openslug-native-packages.conf --- conf/distro/openslug-native-packages.conf | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 -- cgit v1.2.3 From 96cd691a68ad24be5b7238a75742d0d7c8dcc482 Mon Sep 17 00:00:00 2001 From: David Karlstrom Date: Wed, 3 Aug 2005 14:41:57 +0000 Subject: Add python-crypt to openslug-native.bb needed for ipkg-make-index --- packages/meta/openslug-native.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/meta/openslug-native.bb b/packages/meta/openslug-native.bb index bb5a68d01e..0f388294e2 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 = "r8" INHIBIT_DEFAULT_DEPS = "1" ALLOW_EMPTY = 1 @@ -36,7 +36,7 @@ OPENSLUG_NATIVE = "\ ncurses ncurses-dev ncurses-terminfo \ patch \ perl perl-modules \ - python-core python-io python-lang python-pickle python-shell python-textutils \ + python-core python-crypt python-io python-lang python-pickle python-shell python-textutils \ sed \ tar \ util-linux \ -- cgit v1.2.3 From 784cf458242a13777afea2eb5fe89b7f65ca6aa2 Mon Sep 17 00:00:00 2001 From: David Karlstrom Date: Wed, 3 Aug 2005 14:43:38 +0000 Subject: Add libtool, pkgconfig and quilt to openslug-native.bb --- packages/meta/openslug-native.bb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/packages/meta/openslug-native.bb b/packages/meta/openslug-native.bb index 0f388294e2..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 = "r8" +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 \ + pkgconfig \ python-core python-crypt python-io python-lang python-pickle python-shell python-textutils \ + quilt \ sed \ tar \ util-linux \ -- cgit v1.2.3 From b57ec72f165d15125f9038279a0f812c17d23a0a Mon Sep 17 00:00:00 2001 From: Oyvind Repvik Date: Wed, 3 Aug 2005 15:51:45 +0000 Subject: Update u-a to remove the symlinks as well --- conf/distro/openslug-packages.conf | 1 + packages/dropbear/dropbear_0.46.bb | 8 +++----- 2 files changed, 4 insertions(+), 5 deletions(-) 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 } -- cgit v1.2.3