diff options
| -rw-r--r-- | packages/madfu/.mtn2git_empty | 0 | ||||
| -rw-r--r-- | packages/madfu/files/.mtn2git_empty | 0 | ||||
| -rw-r--r-- | packages/madfu/files/autofoo.patch | 54 | ||||
| -rw-r--r-- | packages/madfu/madfu_1.2.bb | 27 | ||||
| -rw-r--r-- | packages/meta/slugos-packages.bb | 4 | ||||
| -rw-r--r-- | packages/perl/perl.inc | 11 | ||||
| -rw-r--r-- | packages/puzzles/puzzles_r7436.bb (renamed from packages/puzzles/puzzles_r7387.bb) | 0 |
7 files changed, 88 insertions, 8 deletions
diff --git a/packages/madfu/.mtn2git_empty b/packages/madfu/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/madfu/.mtn2git_empty diff --git a/packages/madfu/files/.mtn2git_empty b/packages/madfu/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/madfu/files/.mtn2git_empty diff --git a/packages/madfu/files/autofoo.patch b/packages/madfu/files/autofoo.patch new file mode 100644 index 0000000000..a89d38b144 --- /dev/null +++ b/packages/madfu/files/autofoo.patch @@ -0,0 +1,54 @@ +--- madfuload-1.2/configure.org 2007-04-04 13:30:55.186393000 +0200 ++++ madfuload-1.2/configure 2007-04-04 13:33:26.286393000 +0200 +@@ -2831,50 +2831,7 @@ + else + udev_dir="/etc/udev" + fi; +-as_ac_File=`echo "ac_cv_file_$udev_dir/udev.conf" | $as_tr_sh` +-echo "$as_me:$LINENO: checking for $udev_dir/udev.conf" >&5 +-echo $ECHO_N "checking for $udev_dir/udev.conf... $ECHO_C" >&6 +-if eval "test \"\${$as_ac_File+set}\" = set"; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- test "$cross_compiling" = yes && +- { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 +-echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} +- { (exit 1); exit 1; }; } +-if test -r "$udev_dir/udev.conf"; then +- eval "$as_ac_File=yes" +-else +- eval "$as_ac_File=no" +-fi +-fi +-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_File'}'`" >&5 +-echo "${ECHO_T}`eval echo '${'$as_ac_File'}'`" >&6 +-if test `eval echo '${'$as_ac_File'}'` = yes; then +- udev_conf="$udev_dir/udev.conf" +-else +- udev_conf="" +-fi +- +- +-echo "$as_me:$LINENO: checking for udev rules directory" >&5 +-echo $ECHO_N "checking for udev rules directory... $ECHO_C" >&6 +-udev_rules="" +-if test -r "$udev_conf"; then +- udev_rules=`. "$udev_conf"; echo "$udev_rules"` +-fi +-if test -n "$udev_rules"; then +- echo "$as_me:$LINENO: result: $udev_rules" >&5 +-echo "${ECHO_T}$udev_rules" >&6 +-else +- udev_rules="$udev_dir/rules.d" +- echo "$as_me:$LINENO: result: not found; assuming $udev_rules" >&5 +-echo "${ECHO_T}not found; assuming $udev_rules" >&6 +-fi +-if test ! -d "$udev_rules"; then +- { { echo "$as_me:$LINENO: error: $udev_rules not found" >&5 +-echo "$as_me: error: $udev_rules not found" >&2;} +- { (exit 1); exit 1; }; } +-fi ++udev_rules="$udev_dir/rules.d" + UDEV_RULES_DIR=$udev_rules + + diff --git a/packages/madfu/madfu_1.2.bb b/packages/madfu/madfu_1.2.bb new file mode 100644 index 0000000000..354e65aced --- /dev/null +++ b/packages/madfu/madfu_1.2.bb @@ -0,0 +1,27 @@ +DESCRIPTION = "Firmware loader for m-audio devices" +LICENSE = "GPL" +PR = "r1" + +SRC_URI = "http://heanet.dl.sourceforge.net/sourceforge/usb-midi-fw/madfuload-1.2.tar.gz \ + file://autofoo.patch;patch=1" + +S = "${WORKDIR}/madfuload-1.2" + +inherit autotools + +do_configure() { + oe_runconf +} +do_compile() { + oe_runmake +} +do_install() { + install -d ${D}/${sbindir} + install -m 755 ${S}/madfuload ${D}/${sbindir} + install -d ${D}/${libdir}/firmware + install -m 644 ${S}/*.bin ${D}/${libdir}/firmware + install -d ${D}/${sysconfdir}/udev/rules + install -m 644 ${S}/42-madfuload.rules ${D}/${sysconfdir}/udev/rules +} + +FILES_${PN} += "${libdir}/firmware/" diff --git a/packages/meta/slugos-packages.bb b/packages/meta/slugos-packages.bb index 41ddc79e8d..287a8166af 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 = "r29" +PR = "r30" CONFLICTS = "db3" COMPATIBLE_MACHINE = "nslu2" @@ -104,6 +104,7 @@ SLUGOS_PACKAGES = "\ lsof \ lvm2 \ m4 \ + madfu \ madplay \ madwifi-ng \ mailx \ @@ -162,6 +163,7 @@ SLUGOS_PACKAGES = "\ streamripper \ sysfsutils \ tar \ + task-native-sdk \ task-mokogateway-everything \ thttpd \ tiff \ diff --git a/packages/perl/perl.inc b/packages/perl/perl.inc index f063d0e403..64e548a121 100644 --- a/packages/perl/perl.inc +++ b/packages/perl/perl.inc @@ -46,13 +46,10 @@ do_compile() { if test ${TARGET_ARCH} = "sh3" -o ${TARGET_ARCH} = "sh4"; then OPTIONS="LD=${TARGET_ARCH}-${TARGET_OS}-gcc" fi - - # You must use gcc to link on powerpc also - OPTIONS="" - if test ${TARGET_ARCH} = "powerpc" ; then - OPTIONS="LD=${TARGET_ARCH}-${TARGET_OS}-gcc" - fi - + # You must use gcc to link on powerpc also + if test ${TARGET_ARCH} = "powerpc" ; then + OPTIONS="LD=${TARGET_ARCH}-${TARGET_OS}-gcc" + fi oe_runmake perl $OPTIONS } diff --git a/packages/puzzles/puzzles_r7387.bb b/packages/puzzles/puzzles_r7436.bb index 9b3b3842c7..9b3b3842c7 100644 --- a/packages/puzzles/puzzles_r7387.bb +++ b/packages/puzzles/puzzles_r7436.bb |