summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Hentges <oe@hentges.net>2007-06-30 15:04:16 +0000
committerMatthias Hentges <oe@hentges.net>2007-06-30 15:04:16 +0000
commit82a28216be6b768237beeaed7e997c8632f96049 (patch)
treee57b80bfb9b67ea69030dd3d4c8793dda9ef3219
parentf37cf32fdd68ac074c7d960d770d4e76b729caa0 (diff)
parentf39d03b866c12872d98be8028a8e314c756002e1 (diff)
merge of 'a716072bb40b66870ec9797e151cda776beacf6c'
and 'b3615d69f6416b196ef0183e2864d4289292a007'
-rw-r--r--classes/sanity.bbclass2
-rw-r--r--conf/distro/angstrom-2007.1.conf1
-rw-r--r--conf/distro/include/slugos.inc4
-rw-r--r--packages/aircrack/aircrack-ng_0.7.bb25
-rw-r--r--packages/aircrack/aircrack-ng_0.9.1.bb (renamed from packages/aircrack/aircrack-ng_0.9.bb)6
-rw-r--r--packages/aircrack/aircrack-ng_1.0-svn.bb33
-rw-r--r--packages/aircrack/files/makefile-ldflags.patch13
-rw-r--r--packages/apex/apex_1.5.8.bb (renamed from packages/apex/apex_1.5.6.bb)0
-rw-r--r--packages/apex/nslu2/defconfig4
-rw-r--r--packages/efl1/esmart_0.9.0.009.bb1
-rw-r--r--packages/gtkmm/gtkmm.inc13
-rw-r--r--packages/gtkmm/gtkmm_2.10.10.bb4
-rw-r--r--packages/gtkmm/gtkmm_2.8.3.bb13
-rw-r--r--packages/images/slugos-image.bb2
-rw-r--r--packages/linux/compulab-pxa270_2.6.16.bb8
-rw-r--r--packages/linux/ixp4xx-kernel/2.6.15/00-memory-h-page-shift.patch91
-rw-r--r--packages/linux/ixp4xx-kernel/2.6.15/10-mtdpart-redboot-fis-byteswap.patch70
-rw-r--r--packages/linux/ixp4xx-kernel/2.6.15/11-mtdpart-redboot-config-byteswap.patch74
-rw-r--r--packages/linux/ixp4xx-kernel/2.6.15/15-jffs2-endian-config.patch80
-rw-r--r--packages/linux/ixp4xx-kernel/2.6.15/40-rtc-class.patch3208
-rw-r--r--packages/linux/ixp4xx-kernel/2.6.15/45-eeprom-notifier.patch184
-rw-r--r--packages/linux/ixp4xx-kernel/2.6.15/48-setup-byteswap-cmdline.patch48
-rw-r--r--packages/linux/ixp4xx-kernel/2.6.15/50-nas100d-arch.patch453
-rw-r--r--packages/linux/ixp4xx-kernel/2.6.15/55-rtc-pcf8563.patch174
-rw-r--r--packages/linux/ixp4xx-kernel/2.6.15/60-ixp4xx-beeper.patch238
-rw-r--r--packages/linux/ixp4xx-kernel/2.6.15/60-nas100d-i2c.patch531
-rw-r--r--packages/linux/ixp4xx-kernel/2.6.15/60-nas100d-ide.patch155
-rw-r--r--packages/linux/ixp4xx-kernel/2.6.15/60-nas100d-rtc.patch21
-rw-r--r--packages/linux/ixp4xx-kernel/2.6.15/65-loft-config.patch84
-rw-r--r--packages/linux/ixp4xx-kernel/2.6.15/81-nslu2-power.patch12
-rw-r--r--packages/linux/ixp4xx-kernel/2.6.15/82-nas100d-power.patch12
-rw-r--r--packages/linux/ixp4xx-kernel/2.6.15/85-timer.patch280
-rw-r--r--packages/linux/ixp4xx-kernel/2.6.15/91-maclist.patch570
-rw-r--r--packages/linux/ixp4xx-kernel/2.6.15/92-nas100d-maclist.patch72
-rw-r--r--packages/linux/ixp4xx-kernel/2.6.15/92-nslu2-maclist.patch80
-rw-r--r--packages/linux/ixp4xx-kernel/2.6.15/93-loft-maclist.patch96
-rw-r--r--packages/linux/ixp4xx-kernel/2.6.15/94-nas100d-setup.patch71
-rw-r--r--packages/linux/ixp4xx-kernel/2.6.15/94-nslu2-setup.patch72
-rw-r--r--packages/linux/ixp4xx-kernel/2.6.15/95-ixp4xx-leds.patch260
-rw-r--r--packages/linux/ixp4xx-kernel/2.6.15/950-leds-timer.patch151
-rw-r--r--packages/linux/ixp4xx-kernel/2.6.15/951-ixp4xx-leds-cpu-activity.patch592
-rw-r--r--packages/linux/ixp4xx-kernel/2.6.15/96-loft-leds.patch62
-rw-r--r--packages/linux/ixp4xx-kernel/2.6.15/96-nas100d-leds.patch78
-rw-r--r--packages/linux/ixp4xx-kernel/2.6.15/96-nslu2-leds.patch89
-rw-r--r--packages/linux/ixp4xx-kernel/2.6.16/06-remove-extraversion.patch11
-rw-r--r--packages/linux/ixp4xx-kernel/2.6.16/10-ixp4xx-fix-irq.patch25
-rw-r--r--packages/linux/ixp4xx-kernel/2.6.16/11-mtdpart-redboot-config-byteswap.patch74
-rw-r--r--packages/linux/ixp4xx-kernel/2.6.16/15-jffs2-endian-config.patch85
-rw-r--r--packages/linux/ixp4xx-kernel/2.6.16/40-rtc-class.patch5846
-rw-r--r--packages/linux/ixp4xx-kernel/2.6.16/45-eeprom-new-notifier.patch209
-rw-r--r--packages/linux/ixp4xx-kernel/2.6.16/48-setup-byteswap-cmdline.patch51
-rw-r--r--packages/linux/ixp4xx-kernel/2.6.16/50-hwmon-ad741x.patch378
-rw-r--r--packages/linux/ixp4xx-kernel/2.6.16/65-loft-config.patch90
-rw-r--r--packages/linux/ixp4xx-kernel/2.6.16/75-dsmg600.patch353
-rw-r--r--packages/linux/ixp4xx-kernel/2.6.16/83-nas100d-memory-fixup.patch66
-rw-r--r--packages/linux/ixp4xx-kernel/2.6.16/84-nas100d-cmdline.patch31
-rw-r--r--packages/linux/ixp4xx-kernel/2.6.16/85-timer.patch280
-rw-r--r--packages/linux/ixp4xx-kernel/2.6.16/91-maclist.patch573
-rw-r--r--packages/linux/ixp4xx-kernel/2.6.16/92-nas100d-mac.patch84
-rw-r--r--packages/linux/ixp4xx-kernel/2.6.16/92-nas100d-maclist.patch77
-rw-r--r--packages/linux/ixp4xx-kernel/2.6.16/92-nslu2-mac.patch87
-rw-r--r--packages/linux/ixp4xx-kernel/2.6.16/92-nslu2-maclist.patch81
-rw-r--r--packages/linux/ixp4xx-kernel/2.6.16/94-loft-setup.patch214
-rw-r--r--packages/linux/ixp4xx-kernel/2.6.16/94-nslu2-setup.patch74
-rw-r--r--packages/linux/ixp4xx-kernel/2.6.16/951-ixp4xx-leds-cpu-activity.patch596
-rw-r--r--packages/linux/ixp4xx-kernel/2.6.16/96-nas100d-leds.patch82
-rw-r--r--packages/linux/ixp4xx-kernel/2.6.16/96-nslu2-leds.patch89
-rw-r--r--packages/linux/ixp4xx-kernel/2.6.16/96-pata-ixp4xx.patch299
-rw-r--r--packages/linux/ixp4xx-kernel/2.6.16/97-ds101-buttons.patch122
-rw-r--r--packages/linux/ixp4xx-kernel/2.6.16/97-ds101-doc.patch43
-rw-r--r--packages/linux/ixp4xx-kernel/2.6.16/97-ds101-includes.patch120
-rw-r--r--packages/linux/ixp4xx-kernel/2.6.16/97-ds101-pci.patch72
-rw-r--r--packages/linux/ixp4xx-kernel/2.6.16/97-ds101-setup.patch290
-rw-r--r--packages/linux/ixp4xx-kernel/2.6.16/97-ds101.patch457
-rw-r--r--packages/linux/ixp4xx-kernel/2.6.16/copypage-xscale.patch21
-rw-r--r--packages/linux/ixp4xx-kernel/2.6.16/leds-class.patch1862
-rw-r--r--packages/linux/ixp4xx-kernel/2.6.16/linux-2.6.16-i2c.patch13671
-rw-r--r--packages/linux/ixp4xx-kernel/2.6.16/patch-2.6.16-rc6-ide118684
-rw-r--r--packages/linux/ixp4xx-kernel/2.6.18/.mtn2git_empty (renamed from packages/linux/ixp4xx-kernel/2.6.15/.mtn2git_empty)0
-rw-r--r--packages/linux/ixp4xx-kernel/2.6.18/defconfig (renamed from packages/linux/ixp4xx-kernel/2.6.16/defconfig)359
-rw-r--r--packages/linux/ixp4xx-kernel/2.6.19/series47
-rw-r--r--packages/linux/ixp4xx-kernel/2.6.20/series43
-rw-r--r--packages/linux/ixp4xx-kernel/2.6.22/.mtn2git_empty (renamed from packages/linux/ixp4xx-kernel/2.6.16/.mtn2git_empty)0
-rw-r--r--packages/linux/ixp4xx-kernel/2.6.22/defconfig (renamed from packages/linux/ixp4xx-kernel/2.6.15/defconfig)1194
-rw-r--r--packages/linux/ixp4xx-kernel_2.6.15.3.bb59
-rw-r--r--packages/linux/ixp4xx-kernel_2.6.16.bb48
-rw-r--r--packages/linux/ixp4xx-kernel_2.6.17.bb38
-rw-r--r--packages/linux/ixp4xx-kernel_2.6.18.bb4
-rw-r--r--packages/linux/ixp4xx-kernel_2.6.19.bb1
-rw-r--r--packages/linux/ixp4xx-kernel_2.6.21.5.bb (renamed from packages/linux/ixp4xx-kernel_2.6.21.1.bb)2
-rw-r--r--packages/lyx/lyx_1.4.4+1.5.0rc1.bb4
-rw-r--r--packages/misc-binary-only/prism-firmware.bb2
-rw-r--r--packages/misc-binary-only/prism-firmware/prism-fw.sh5
-rw-r--r--packages/mplayer/mplayer_0.0+1.0rc1.bb8
-rw-r--r--packages/proj4/proj-4-native_4.9.bb3
-rw-r--r--packages/proj4/proj-4.inc18
-rw-r--r--packages/proj4/proj-4_4.9.bb18
-rw-r--r--packages/tasks/task-slugos.bb7
-rw-r--r--packages/tetex/tetex_3.0.bb16
-rwxr-xr-xpackages/udev/files/init2
-rw-r--r--packages/udev/udev-092/init2
-rw-r--r--packages/udev/udev-097/init2
-rw-r--r--packages/udev/udev-100/init2
-rw-r--r--packages/udev/udev_092.bb2
-rw-r--r--packages/udev/udev_097.bb2
-rw-r--r--packages/udev/udev_100.bb2
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}
diff --git a/packages/aircrack/aircrack-ng_1.0-svn.bb b/packages/aircrack/aircrack-ng_1.0-svn.bb
new file mode 100644
index 0000000000..a09957bb45
--- /dev/null
+++ b/