From 8102686fbb57b1eb74235f9dd08a9dc6a065bb6a Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Thu, 8 Mar 2007 23:09:57 +0000 Subject: sjf2410-linux-native: Fixed ordering of do_deploy to work with rm_work. --- packages/s3c2410-utils/sjf2410-linux-native_20060807.bb | 2 +- packages/s3c2410-utils/sjf2410-linux-native_svn.bb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/s3c2410-utils/sjf2410-linux-native_20060807.bb b/packages/s3c2410-utils/sjf2410-linux-native_20060807.bb index 70cc6c7424..53b2d0c8e0 100644 --- a/packages/s3c2410-utils/sjf2410-linux-native_20060807.bb +++ b/packages/s3c2410-utils/sjf2410-linux-native_20060807.bb @@ -29,4 +29,4 @@ do_install() { : } -addtask deploy before do_build after do_compile +addtask deploy before do_package after do_install diff --git a/packages/s3c2410-utils/sjf2410-linux-native_svn.bb b/packages/s3c2410-utils/sjf2410-linux-native_svn.bb index 55176029ab..60cce4a3e2 100644 --- a/packages/s3c2410-utils/sjf2410-linux-native_svn.bb +++ b/packages/s3c2410-utils/sjf2410-linux-native_svn.bb @@ -29,4 +29,4 @@ do_install() { : } -addtask deploy before do_build after do_compile +addtask deploy before do_package after do_install -- cgit v1.2.3 From c3f8397720b1ae490b509442632956653a0abd32 Mon Sep 17 00:00:00 2001 From: Florian Boor Date: Fri, 9 Mar 2007 00:06:40 +0000 Subject: iptables: Apply patch to use cross ar instead of host ar. (by Cyril Romain) --- packages/iptables/files/.mtn2git_empty | 0 packages/iptables/files/compile.patch | 17 +++++++++++++++++ packages/iptables/iptables_1.2.9.bb | 5 +++-- packages/iptables/iptables_1.3.3.bb | 5 +++-- 4 files changed, 23 insertions(+), 4 deletions(-) create mode 100644 packages/iptables/files/.mtn2git_empty create mode 100644 packages/iptables/files/compile.patch diff --git a/packages/iptables/files/.mtn2git_empty b/packages/iptables/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/iptables/files/compile.patch b/packages/iptables/files/compile.patch new file mode 100644 index 0000000000..76662d9748 --- /dev/null +++ b/packages/iptables/files/compile.patch @@ -0,0 +1,17 @@ +Index: iptables-1.3.3/extensions/Makefile +=================================================================== +--- iptables-1.3.3.orig/extensions/Makefile ++++ iptables-1.3.3/extensions/Makefile +@@ -67,10 +67,10 @@ endif + + ifdef NO_SHARED_LIBS + extensions/libext.a: $(EXT_OBJS) +- rm -f $@; ar crv $@ $(EXT_OBJS) ++ rm -f $@; $(AR) crv $@ $(EXT_OBJS) + + extensions/libext6.a: $(EXT6_OBJS) +- rm -f $@; ar crv $@ $(EXT6_OBJS) ++ rm -f $@; $(AR) crv $@ $(EXT6_OBJS) + + extensions/initext.o: extensions/initext.c + extensions/initext6.o: extensions/initext6.c diff --git a/packages/iptables/iptables_1.2.9.bb b/packages/iptables/iptables_1.2.9.bb index fe43ff488e..213802d17f 100644 --- a/packages/iptables/iptables_1.2.9.bb +++ b/packages/iptables/iptables_1.2.9.bb @@ -1,9 +1,10 @@ SECTION = "console/network" DESCRIPTION = "iptables network filtering tools" LICENSE = "GPL" -PR = "r1" +PR = "r2" -SRC_URI = "http://www.netfilter.org/files/iptables-${PV}.tar.bz2" +SRC_URI = "http://www.netfilter.org/files/iptables-${PV}.tar.bz2 \ + file://compile.patch;patch=1" S = "${WORKDIR}/iptables-${PV}" diff --git a/packages/iptables/iptables_1.3.3.bb b/packages/iptables/iptables_1.3.3.bb index 4c500ad5b1..5f19d45317 100644 --- a/packages/iptables/iptables_1.3.3.bb +++ b/packages/iptables/iptables_1.3.3.bb @@ -3,14 +3,15 @@ HOMEPAGE = "http://www.netfilter.org/" SECTION = "console/utils" LICENSE = "GPL" RRECOMMENDS = "kernel-module-ip-tables kernel-module-iptable-filter" -PR = "r3" +PR = "r4" PACKAGES =+ "${PN}-utils" FILES_${PN}-utils = "${sbindir}/iptables-save ${sbindir}/iptables-restore" -SRC_URI = "http://www.netfilter.org/files/iptables-${PV}.tar.bz2" +SRC_URI = "http://www.netfilter.org/files/iptables-${PV}.tar.bz2 \ + file://compile.patch;patch=1" S = "${WORKDIR}/iptables-${PV}" -- cgit v1.2.3 From af9ed67a48371bce6bf02cc7dc191ac1ada9325e Mon Sep 17 00:00:00 2001 From: Mike Westerhof Date: Fri, 9 Mar 2007 00:07:31 +0000 Subject: slugos.inc, slugos-native.bb: nail madwifi-ng to a specific version and remove monotone-6 in hopes of getting the feeds to build once again. --- conf/distro/include/slugos.inc | 5 +++++ packages/meta/slugos-native.bb | 9 ++++++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/conf/distro/include/slugos.inc b/conf/distro/include/slugos.inc index a89d193225..3edaa342cb 100644 --- a/conf/distro/include/slugos.inc +++ b/conf/distro/include/slugos.inc @@ -144,3 +144,8 @@ PREFERRED_VERSION_ipkg-native ?= "0.99.154" #FIXME: HACK: REMOVE THIS IGNORE_STRIP_ERRORS = "" + +# Due to upstream instability, and another OE project with conflicting +# needs, nail down a specific, known-working version of madwifi-ng. +# Remove this once the madwifi-ng stuff seems to stabilize once again. +PREFERRED_VERSION_madwifi-ng ?= "r2156-20070225" diff --git a/packages/meta/slugos-native.bb b/packages/meta/slugos-native.bb index 3b4023ba45..281310a2dd 100644 --- a/packages/meta/slugos-native.bb +++ b/packages/meta/slugos-native.bb @@ -78,9 +78,12 @@ SLUGOS_NATIVE = "\ # even on a thumb system (and this can be set in the tool's .bb file), # however even this doesn't work for very large programs at present # (only monotone!) -SLUGOS_NATIVE_THUMB_BROKEN = "\ - monotone-6 \ - " +####### *-*-* TEMPORARY: mwester - remove monotone as it wont' build. +#SLUGOS_NATIVE_THUMB_BROKEN = "\ +# monotone-6 \ +# " +SLUGOS_NATIVE_THUMB_BROKEN = "" +###### *-*-* SLUGOS_NATIVE_THUMB_BROKEN_thumb = "" -- cgit v1.2.3 From 573ffe08d8f08e9235d0c2ae0eb9ac86dcc22c51 Mon Sep 17 00:00:00 2001 From: Matthias Hentges Date: Fri, 9 Mar 2007 00:19:45 +0000 Subject: alsa: alsa-state: Load asound.state on boot... --- packages/alsa/alsa-state.bb | 16 +++++++++++++--- packages/alsa/alsa-state/alsa-state | 29 +++++++++++++++++++++++++++++ 2 files changed, 42 insertions(+), 3 deletions(-) create mode 100755 packages/alsa/alsa-state/alsa-state diff --git a/packages/alsa/alsa-state.bb b/packages/alsa/alsa-state.bb index d49aa3231b..53c69c5c69 100644 --- a/packages/alsa/alsa-state.bb +++ b/packages/alsa/alsa-state.bb @@ -14,21 +14,30 @@ LICENSE = "GPL" ###################################################################################### -PV = "0.0.1" +PV = "0.0.2" PR = "r0" ###################################################################################### -SRC_URI = "file://asound.state" +SRC_URI = "file://asound.state \ + file://alsa-state" FILES_${PN} = "/etc/*" ###################################################################################### +inherit update-rc.d + +INITSCRIPT_NAME = "alsa-state" +INITSCRIPT_PARAMS = "defaults 10" + +###################################################################################### + do_install() { - install -d ${D}${sysconfdir} + install -d ${D}${sysconfdir}/init.d install -m 0644 ${WORKDIR}/asound.state ${D}${sysconfdir} + install -m 0755 ${WORKDIR}/alsa-state ${D}${sysconfdir}/init.d } @@ -38,3 +47,4 @@ pkg_postinst_${PN}() { /usr/sbin/alsactl -f ${sysconfdir}/asound.state restore fi } + diff --git a/packages/alsa/alsa-state/alsa-state b/packages/alsa/alsa-state/alsa-state new file mode 100755 index 0000000000..c6bc1fd494 --- /dev/null +++ b/packages/alsa/alsa-state/alsa-state @@ -0,0 +1,29 @@ +#! /bin/sh +# +# Copyright Matthias Hentges (c) 2007 +# License: GPL (see http://www.gnu.org/licenses/gpl.txt for a copy of the license) +# +# Filename: alsa-state +# Date: 20070308 (YMD) + + +asound_restore(){ + echo "ALSA: Restoring mixer settings..." + if test -x /usr/sbin/alsactl -a -e /etc/asound.state + then + /usr/sbin/alsactl -f /etc/asound.state restore + fi +} + +asound_store(){ + echo "ALSA: Storing mixer settings..." + if test -x /usr/sbin/alsactl + then + /usr/sbin/alsactl -f /etc/asound.state store + fi +} + +case "$1" in +start) asound_restore ;; +stop) asound_store ;; +esac -- cgit v1.2.3 From c7b0e1942b78e693899d0374a28f26642c7315b9 Mon Sep 17 00:00:00 2001 From: Mike Westerhof Date: Fri, 9 Mar 2007 02:09:06 +0000 Subject: slugos-packages: mediatomb removed as it will not build either. --- packages/meta/slugos-packages.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/meta/slugos-packages.bb b/packages/meta/slugos-packages.bb index 06be00eb67..7b5f18d4ec 100644 --- a/packages/meta/slugos-packages.bb +++ b/packages/meta/slugos-packages.bb @@ -107,7 +107,6 @@ SLUGOS_PACKAGES = "\ make \ masqmail \ mdadm \ - mediatomb \ memtester \ mgetty \ miau \ @@ -183,6 +182,7 @@ SLUGOS_BROKEN_PACKAGES = "\ gphoto2 \ irssi \ libgphoto2 \ + mediatomb \ netpbm \ puppy \ pvrusb2-mci \ -- cgit v1.2.3 From 60cbd79004f7a2d867a3ca654e1027e38677c142 Mon Sep 17 00:00:00 2001 From: Mike Westerhof Date: Fri, 9 Mar 2007 03:17:39 +0000 Subject: slugos-packages.bb: demote mpd, breaks the autobuild too. --- packages/meta/slugos-packages.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/meta/slugos-packages.bb b/packages/meta/slugos-packages.bb index 7b5f18d4ec..d5b1a5f9b7 100644 --- a/packages/meta/slugos-packages.bb +++ b/packages/meta/slugos-packages.bb @@ -5,7 +5,7 @@ DESCRIPTION = "Packages that are compatible with the SlugOS firmware" HOMEPAGE = "http://www.nslu2-linux.org" LICENSE = "MIT" -PR = "r20" +PR = "r21" CONFLICTS = "db3" COMPATIBLE_MACHINE = "nslu2" @@ -113,7 +113,6 @@ SLUGOS_PACKAGES = "\ microcom \ minicom \ motion \ - mpd \ mt-daapd \ mtd-utils \ mutt \ @@ -183,6 +182,7 @@ SLUGOS_BROKEN_PACKAGES = "\ irssi \ libgphoto2 \ mediatomb \ + mpd \ netpbm \ puppy \ pvrusb2-mci \ -- cgit v1.2.3