Merge openembedded@openembedded.bkbits.net:packages

into direwolf.itg.ti.com:/home/kergoth/coding/projects/user/oe-metadata/packages

2004/01/16 14:47:41-06:00 ti.com!kergoth
Move the old and really new libnet versions out of the main part of the tree, to stop breaking the dsniff and libnids builds.

BKrev: 40084df838x9FIKRdj4UOVx9sDlLgg

diff --git a/libnet/libnet-1.1.0/configure.patch b/libnet/libnet-1.1.0/configure.patch
deleted file mode 100644 (file)
index 876c429..0000000
--- a/libnet/libnet-1.1.0/configure.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-
-#
-# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
-#
-
---- libnet/acinclude.m4~configure
-+++ libnet/acinclude.m4
-@@ -184,7 +184,7 @@
-     AC_CACHE_VAL(ac_cv_lbl_unaligned_fail,
-         [case "$target_cpu" in
- 
--        alpha|hp*|mips|sparc)
-+        alpha|hp*|mips|sparc|arm)
-                 ac_cv_lbl_unaligned_fail=yes
-                 ;;
- 
-@@ -259,7 +259,8 @@
- dnl
- 
- AC_DEFUN(AC_LIBNET_ENDIAN_CHECK,
--    [AC_MSG_CHECKING(machine endianess)
-+      [AC_CACHE_CHECK([machine_endianness],
-+              ac_cv_libnet_endianess, [
- 
-     cat > conftest.c << EOF
- #       include <stdio.h>
-@@ -312,8 +313,7 @@
-             fi                                
-         fi
-         rm -f conftest* core core.conftest
--
--        AC_MSG_RESULT($ac_cv_libnet_endianess)
-+      ])
- 
-         if test $ac_cv_libnet_endianess = big ; then
-             AC_DEFINE(LIBNET_BIG_ENDIAN)
-@@ -324,7 +324,7 @@
-             ENDIANESS="LIBNET_LIL_ENDIAN"
-             LIBNET_CONFIG_DEFINES="$LIBNET_CONFIG_DEFINES -DLIBNET_LIL_ENDIAN"
-         fi
--    ])
-+])
- 
- dnl
- dnl Improved version of AC_CHECK_LIB
---- libnet/./configure.in~configure
-+++ libnet/./configure.in
-@@ -7,10 +7,11 @@
- dnl Process this file with autoconf to produce a configure script.
- 
- 
--AC_INIT(src/libnet_build_ip.c)
-+AC_INIT
-+AC_CONFIG_SRCDIR([src/libnet_build_ip.c])
- LIBNET_VERSION=`cat VERSION`
- AC_MSG_RESULT(beginning autoconfiguration process for libnet-$LIBNET_VERSION...)
--AC_CANONICAL_SYSTEM
-+AC_CANONICAL_TARGET([])
- 
- AM_INIT_AUTOMAKE(libnet, $LIBNET_VERSION)
- AM_CONFIG_HEADER(include/config.h)

diff --git a/libnet/libnet_0.10.11.oe b/libnet/libnet_0.10.11.oe
deleted file mode 100644 (file)
index b52a305..0000000
--- a/libnet/libnet_0.10.11.oe
+++ /dev/null
@@ -1,33 +0,0 @@
-DEPENDS = virtual/libc
-RDEPENDS = libc6
-
-SRC_URI := ${SOURCEFORGE_MIRROR}/libnet/libnet-0.10.11.tar.gz \
-          file://${FILESDIR}/compile.patch;patch=1
-S := ${WORKDIR}/${PN}
-
-do_configure () {
-       if [ -e makfiles/${TARGET_OS}.mak ]; then
-               cp makfiles/${TARGET_OS}.mak port.mak
-       else
-               die "Unable to locate default .make file for OS ${TARGET_OS}"
-       fi
-}
-
-CFLAGS_prepend='-I${S}/include '
-EXTRA_OEMAKE=
-do_compile () {
-       oe_runmake 'CC=${CC}' 'LD=${LD}' 'AR=${AR}' 'CXX=${CXX}' \
-                  'WARNING_FLAGS=${CFLAGS}'
-}
-
-do_stage () {
-       install -d ${STAGING_LIBDIR} ${STAGING_DIR}/target/include
-       install -m 0755 lib/libnet.a ${STAGING_LIBDIR}/
-       install -m 0644 include/libnet.h ${STAGING_DIR}/target/include/
-}
-
-do_install () {
-       install -d ${D}/${libdir} ${D}/${includedir}
-       install -m 0755 lib/libnet.a ${D}/${libdir}/
-       install -m 0644 include/libnet.h ${D}/${includedir}/
-}

diff --git a/libnet/libnet_1.1.0.oe b/libnet/libnet_1.1.0.oe
deleted file mode 100644 (file)
index 862ceaa..0000000
--- a/libnet/libnet_1.1.0.oe
+++ /dev/null
@@ -1,20 +0,0 @@
-DEPENDS = virtual/libc
-RDEPENDS = libc6
-
-SRC_URI := http://www.packetfactory.net/libnet/dist/libnet.tar.gz \
-          file://${FILESDIR}/configure.patch;patch=1
-S := ${WORKDIR}/libnet
-
-inherit autotools
-
-CPPFLAGS_prepend = "-I${S}/libnet/include "
-
-do_stage () {
-       install -m 0755 libnet-config ${STAGING_BINDIR}/
-       oe_runmake -C src 'DESTDIR=${STAGING_DIR}/target' \
-                         'libdir=/lib' install-libLIBRARIES
-       oe_runmake -C include 'DESTDIR=${STAGING_DIR}/target' \
-                             'includedir=/include' install-includeHEADERS
-       oe_runmake -C include/libnet 'DESTDIR=${STAGING_DIR}/target' \
-                             'includedir=/include' install-libnetincludeHEADERS
-}

diff --git a/libnet/libnet-0.10.11/compile.patch b/nonworking/libnet/libnet-0.10.11/compile.patch
similarity index 100%
rename from libnet/libnet-0.10.11/compile.patch
rename to nonworking/libnet/libnet-0.10.11/compile.patch

diff --git a/nonworking/libnet/libnet-1.1.0/configure.patch b/nonworking/libnet/libnet-1.1.0/configure.patch
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/nonworking/libnet/libnet_0.10.11.oe b/nonworking/libnet/libnet_0.10.11.oe
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/nonworking/libnet/libnet_1.1.0.oe b/nonworking/libnet/libnet_1.1.0.oe
new file mode 100644 (file)
index 0000000..e69de29