diff options
| author | Matthias Hentges <oe@hentges.net> | 2007-06-30 15:04:16 +0000 |
|---|---|---|
| committer | Matthias Hentges <oe@hentges.net> | 2007-06-30 15:04:16 +0000 |
| commit | 82a28216be6b768237beeaed7e997c8632f96049 (patch) | |
| tree | e57b80bfb9b67ea69030dd3d4c8793dda9ef3219 | |
| parent | f37cf32fdd68ac074c7d960d770d4e76b729caa0 (diff) | |
| parent | f39d03b866c12872d98be8028a8e314c756002e1 (diff) | |
merge of 'a716072bb40b66870ec9797e151cda776beacf6c'
and 'b3615d69f6416b196ef0183e2864d4289292a007'
106 files changed, 1096 insertions, 53928 deletions
diff --git a/classes/sanity.bbclass b/classes/sanity.bbclass index ec73e0cab7..b84efb0848 100644 --- a/classes/sanity.bbclass +++ b/classes/sanity.bbclass @@ -86,7 +86,7 @@ def check_sanity(e): if not check_app_exists('${BUILD_PREFIX}g++', e.data): missing = missing + "C++ Compiler (${BUILD_PREFIX}g++)," - required_utilities = "patch diffstat texi2html makeinfo cvs svn git bzip2 tar gzip gawk md5sum" + required_utilities = "patch diffstat texi2html makeinfo cvs svn git bzip2 tar gzip gawk md5sum bison" for util in required_utilities.split(): if not check_app_exists( util, e.data ): diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf index 5b5ea40d5b..f4b16d7dd8 100644 --- a/conf/distro/angstrom-2007.1.conf +++ b/conf/distro/angstrom-2007.1.conf @@ -318,6 +318,7 @@ DISTRO_EXTRA_RDEPENDS += "\ ${@base_contains("MACHINE_FEATURES", "screen", "psplash", "",d)} \ angstrom-version \ ipkg ipkg-collateral \ + util-linux-mount util-linux-umount \ avahi-daemon \ avahi-autoipd \ ${EXTRA_STUFF} \ diff --git a/conf/distro/include/slugos.inc b/conf/distro/include/slugos.inc index 46ba2fcf74..c2970d2b99 100644 --- a/conf/distro/include/slugos.inc +++ b/conf/distro/include/slugos.inc @@ -111,7 +111,7 @@ PREFERRED_VERSION_glibc ?= "2.3.5+cvs20050627" # Select the correct versions of the kernel and modules (these are the # defaults, override in the conf/distro top-level distro file). PREFERRED_PROVIDER_virtual/kernel ?= "ixp4xx-kernel" -PREFERRED_VERSION_ixp4xx-kernel ?= "2.6.21.1" +PREFERRED_VERSION_ixp4xx-kernel ?= "2.6.21.5" # Select the smallest provider of x11 libraries PREFERRED_PROVIDER_virtual/libx11 ?= "diet-x11" @@ -144,4 +144,4 @@ IGNORE_STRIP_ERRORS = "" # Remove this once the madwifi-ng stuff seems to stabilize once again. #PREFERRED_VERSION_madwifi-ng ?= "r2156-20070225" -PREFERRED_VERSION_linux-libc-headers = "2.6.18"
\ No newline at end of file +PREFERRED_VERSION_linux-libc-headers = "2.6.18" diff --git a/packages/aircrack/aircrack-ng_0.7.bb b/packages/aircrack/aircrack-ng_0.7.bb deleted file mode 100644 index bf5bd27d9d..0000000000 --- a/packages/aircrack/aircrack-ng_0.7.bb +++ /dev/null @@ -1,25 +0,0 @@ -SECTION = "console/network" -DESCRIPTION = "Aircrack-ng is a set of tools for wep key statistical cracking" -HOMEPAGE = "http://www.aircrack-ng.org/" -LICENSE = "GPLv2" -PR = "r2" - -SRC_URI = "http://download.aircrack-ng.org/aircrack-ng-${PV}.tar.gz" - -oe_compile() { - oe_runmake CC="${CC}" CXX="${CXX}" CFLAGS="-O3 ${CFLAGS}" CXXFLAGS="${CXXFLAGS}" LD="${LD}" LDFLAGS="${LDFLAGS}" -} - -do_install() { - install -d ${D}/${sbindir} - install -d ${D}/${bindir} - install -m 0755 airodump-ng ${D}/${sbindir} - install -m 0755 aircrack-ng ${D}/${bindir} - install -m 0755 aireplay-ng ${D}/${sbindir} - install -m 0755 airdecap-ng ${D}/${bindir} - install -m 0755 packetforge-ng ${D}/${bindir} - install -m 0755 airmon-ng ${D}/${sbindir} - install -m 0755 ivstools ${D}/${bindir} - install -m 0755 kstats ${D}/${bindir} - install -m 0755 airtun-ng ${D}/${bindir} -} diff --git a/packages/aircrack/aircrack-ng_0.9.bb b/packages/aircrack/aircrack-ng_0.9.1.bb index d19e2e2065..116ee599e3 100644 --- a/packages/aircrack/aircrack-ng_0.9.bb +++ b/packages/aircrack/aircrack-ng_0.9.1.bb @@ -1,15 +1,11 @@ -SECTION = "console/network" DESCRIPTION = "Aircrack-ng is a set of tools for wep key statistical cracking" HOMEPAGE = "http://www.aircrack-ng.org/" +SECTION = "console/network" LICENSE = "GPLv2" PR = "r2" SRC_URI = "http://download.aircrack-ng.org/aircrack-ng-${PV}.tar.gz" -oe_compile() { - oe_runmake CC="${CC}" CXX="${CXX}" CFLAGS="-O3 ${CFLAGS}" CXXFLAGS="${CXXFLAGS}" LD="${LD}" LDFLAGS="${LDFLAGS}" -} - do_install() { install -d ${D}/${sbindir} install -d ${D}/${bindir} |
