summaryrefslogtreecommitdiff
path: root/packages/busybox
diff options
context:
space:
mode:
authorHolger Hans Peter Freyther <zecke@selfish.org>2008-10-22 22:33:26 +0200
committerHolger Hans Peter Freyther <zecke@selfish.org>2008-10-22 22:38:30 +0200
commit53bfb2398c16d2065ffa2bc6cd34c83e15347014 (patch)
tree3793fb7c6cb4799ec2c029b433636cb60fe7625b /packages/busybox
parent576cfbfba8880ea4421369d35236c696188b144d (diff)
parent245f7d129f3dba351b3c8ef284df69a86261904c (diff)
Merge branch 'shared/file-pr-revert' into org.openembedded.dev
Conflicts: packages/busybox/busybox_1.11.3.bb packages/dsplink/codec-engine_2.10.bb packages/gdb/gdb_6.3.bb packages/gdb/gdb_6.4.bb packages/gdb/gdb_6.6.bb packages/gdb/gdb_6.8.bb packages/glibc/glibc_2.2.5.bb packages/glibc/glibc_2.3.2+cvs20040726.bb packages/glibc/glibc_2.3.2.bb packages/glibc/glibc_2.3.3+cvs20041128.bb packages/glibc/glibc_2.3.3+cvs20050221.bb packages/glibc/glibc_2.3.3+cvs20050420.bb packages/glibc/glibc_2.3.3.bb packages/glibc/glibc_2.3.5+cvs20050627.bb packages/glibc/glibc_2.3.6.bb packages/glibc/glibc_2.4.bb packages/glibc/glibc_2.5.bb packages/glibc/glibc_2.6.1.bb packages/glibc/glibc_2.7.bb packages/kexecboot/linux-kexecboot_2.6.26.bb packages/libsdl/libsdl-x11_1.2.11.bb packages/linux/linux-rp_2.6.26.bb packages/mozilla/fennec_hg.bb packages/python/python_2.5.2.bb packages/tasks/task-xfce-base.bb packages/xorg-driver/xf86-video-omapfb_git.bb packages/xorg-xserver/xserver-kdrive_1.4.0.90.bb
Diffstat (limited to 'packages/busybox')
-rw-r--r--packages/busybox/busybox_1.11.3.bb2
-rw-r--r--packages/busybox/busybox_1.2.1.bb2
-rw-r--r--packages/busybox/busybox_1.2.2.bb2
-rw-r--r--packages/busybox/busybox_1.3.1.bb2
-rw-r--r--packages/busybox/busybox_1.7.2.bb2
-rw-r--r--packages/busybox/busybox_1.9.2.bb2
-rw-r--r--packages/busybox/slingbox_1.3.1.bb2
7 files changed, 7 insertions, 7 deletions
diff --git a/packages/busybox/busybox_1.11.3.bb b/packages/busybox/busybox_1.11.3.bb
index ce2b51a24b..790bf518cc 100644
--- a/packages/busybox/busybox_1.11.3.bb
+++ b/packages/busybox/busybox_1.11.3.bb
@@ -1,5 +1,5 @@
require busybox.inc
-FILE_PR = "r0"
+PR = "r0"
SRC_URI = "\
http://www.busybox.net/downloads/busybox-${PV}.tar.gz \
diff --git a/packages/busybox/busybox_1.2.1.bb b/packages/busybox/busybox_1.2.1.bb
index 7c1f389819..4ef3cfeb66 100644
--- a/packages/busybox/busybox_1.2.1.bb
+++ b/packages/busybox/busybox_1.2.1.bb
@@ -1,6 +1,6 @@
require busybox.inc
-FILE_PR = "r17"
+PR = "r17"
SRC_URI += "file://wget-long-options.patch;patch=1 \
file://df_rootfs.patch;patch=1 \
diff --git a/packages/busybox/busybox_1.2.2.bb b/packages/busybox/busybox_1.2.2.bb
index 9fa6bfe7bb..14379a5da6 100644
--- a/packages/busybox/busybox_1.2.2.bb
+++ b/packages/busybox/busybox_1.2.2.bb
@@ -1,6 +1,6 @@
require busybox.inc
-FILE_PR = "r3"
+PR = "r3"
DEFAULT_PREFERENCE = "-1"
diff --git a/packages/busybox/busybox_1.3.1.bb b/packages/busybox/busybox_1.3.1.bb
index 52b0cbbd4a..31a2f1abe7 100644
--- a/packages/busybox/busybox_1.3.1.bb
+++ b/packages/busybox/busybox_1.3.1.bb
@@ -1,6 +1,6 @@
require busybox.inc
-FILE_PR = "r3"
+PR = "r3"
DEFAULT_PREFERENCE = "-1"
diff --git a/packages/busybox/busybox_1.7.2.bb b/packages/busybox/busybox_1.7.2.bb
index 3c02e8ab1f..53304df387 100644
--- a/packages/busybox/busybox_1.7.2.bb
+++ b/packages/busybox/busybox_1.7.2.bb
@@ -1,5 +1,5 @@
require busybox.inc
-FILE_PR = "r9"
+PR = "r9"
SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \
file://busybox-cron \
diff --git a/packages/busybox/busybox_1.9.2.bb b/packages/busybox/busybox_1.9.2.bb
index 161784fffd..e5c0f2473c 100644
--- a/packages/busybox/busybox_1.9.2.bb
+++ b/packages/busybox/busybox_1.9.2.bb
@@ -1,5 +1,5 @@
require busybox.inc
-FILE_PR = "r2"
+PR = "r2"
SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \
file://udhcpscript.patch;patch=1 \
diff --git a/packages/busybox/slingbox_1.3.1.bb b/packages/busybox/slingbox_1.3.1.bb
index 7e5d012ab1..cbcce6c675 100644
--- a/packages/busybox/slingbox_1.3.1.bb
+++ b/packages/busybox/slingbox_1.3.1.bb
@@ -4,7 +4,7 @@ HOMEPAGE = "http://www.busybox.net"
LICENSE = "GPL"
SECTION = "base"
PRIORITY = "required"
-FILE_PR = "r3"
+PR = "r3"
COMPATIBLE_MACHINE = "nslu2"
SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \