[oe-commits] org.oe.dev merge of '340559c2b56b28b0709e19affb5506c4d8727bc4'

[oe commit]

merge of '340559c2b56b28b0709e19affb5506c4d8727bc4'
     and '7636a76a892fc7f94dd1f4061fef697b8e314676'

Author: oe at openembedded.org
Branch: org.openembedded.dev
Revision: 3fa699bc0a61f0428ee89c547a1c840aeaa076c3
ViewMTN: http://monotone.openembedded.org/revision/info/3fa699bc0a61f0428ee89c547a1c840aeaa076c3
Files:
1
packages/busybox/slingbox-1.3.1/trylink-bash.patch
packages/busybox/slingbox_1.3.1.bb
Diffs:

#
# mt diff -r340559c2b56b28b0709e19affb5506c4d8727bc4 -r3fa699bc0a61f0428ee89c547a1c840aeaa076c3
#
# 
# no changes
# 


#
# mt diff -r7636a76a892fc7f94dd1f4061fef697b8e314676 -r3fa699bc0a61f0428ee89c547a1c840aeaa076c3
#
# 
# 
# add_file "packages/busybox/slingbox-1.3.1/trylink-bash.patch"
#  content [08b489ff53ee0f889cf6712d8150c88dff8c030c]
# 
# patch "packages/busybox/slingbox_1.3.1.bb"
#  from [f366957202587b2eaefca465454f5dc881c4a445]
#    to [62efeeb84a12bd2df44a38f8eb61e035c357cecb]
# 
============================================================
--- packages/busybox/slingbox-1.3.1/trylink-bash.patch	08b489ff53ee0f889cf6712d8150c88dff8c030c
+++ packages/busybox/slingbox-1.3.1/trylink-bash.patch	08b489ff53ee0f889cf6712d8150c88dff8c030c
@@ -0,0 +1,8 @@
+--- busybox-1.3.1/scripts/trylink~	2006-12-27 15:23:24.000000000 +1030
++++ busybox-1.3.1/scripts/trylink	2007-12-19 15:03:20.000000000 +1030
+@@ -1,4 +1,4 @@
+-#!/bin/sh
++#!/bin/bash
+ 
+ debug=false
+ 
============================================================
--- packages/busybox/slingbox_1.3.1.bb	f366957202587b2eaefca465454f5dc881c4a445
+++ packages/busybox/slingbox_1.3.1.bb	62efeeb84a12bd2df44a38f8eb61e035c357cecb
@@ -1,10 +1,10 @@ PRIORITY = "required"
 DESCRIPTION = "SlingBox is a minimal version of BusyBox with just enough functionality \
 to enable ipkg to run on an Unslung NSLU2 device."
 HOMEPAGE = "http://www.busybox.net"
 LICENSE = "GPL"
 SECTION = "base"
 PRIORITY = "required"
-PR = "r1"
+PR = "r2"
 COMPATIBLE_MACHINE = "nslu2"
 
 SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \
@@ -14,6 +14,7 @@ SRC_URI = "http://www.busybox.net/downlo
            file://lazy_umount.patch;patch=1 \
            file://halt.patch;patch=1 \
            file://fdisk-readhex.patch;patch=1 \
+           file://trylink-bash.patch;patch=1 \
            file://slingbox_name.patch;patch=1 \
            file://slingbox.patch;patch=1"