diff options
| author | Holger Hans Peter Freyther <zecke@selfish.org> | 2008-10-22 22:33:26 +0200 |
|---|---|---|
| committer | Holger Hans Peter Freyther <zecke@selfish.org> | 2008-10-22 22:38:30 +0200 |
| commit | 53bfb2398c16d2065ffa2bc6cd34c83e15347014 (patch) | |
| tree | 3793fb7c6cb4799ec2c029b433636cb60fe7625b /packages/madwifi | |
| parent | 576cfbfba8880ea4421369d35236c696188b144d (diff) | |
| parent | 245f7d129f3dba351b3c8ef284df69a86261904c (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/madwifi')
| -rw-r--r-- | packages/madwifi/madwifi-ng_r.inc | 2 | ||||
| -rw-r--r-- | packages/madwifi/madwifi-ng_r2826-20071105.bb | 2 | ||||
| -rw-r--r-- | packages/madwifi/madwifi-ng_r3314-20080131.bb | 2 | ||||
| -rw-r--r-- | packages/madwifi/madwifi-ng_r3837-20080802.bb | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/packages/madwifi/madwifi-ng_r.inc b/packages/madwifi/madwifi-ng_r.inc index 9ec0a042c1..ddb1e6a50b 100644 --- a/packages/madwifi/madwifi-ng_r.inc +++ b/packages/madwifi/madwifi-ng_r.inc @@ -4,7 +4,7 @@ PRIORITY = "optional" LICENSE = "GPL" RDEPENDS = "kernel (${KERNEL_VERSION})" DEPENDS = "virtual/kernel" -FILE_PR ="r5" +PR ="r5" WACKELF_SRC_URI = "" WACKELF_SRC_URI_ixp4xx = " file://20-xscale-VFP-wackelf.patch;patch=1" diff --git a/packages/madwifi/madwifi-ng_r2826-20071105.bb b/packages/madwifi/madwifi-ng_r2826-20071105.bb index 97ad1e5f47..5301e3bd42 100644 --- a/packages/madwifi/madwifi-ng_r2826-20071105.bb +++ b/packages/madwifi/madwifi-ng_r2826-20071105.bb @@ -11,4 +11,4 @@ INHIBIT_PACKAGE_STRIP = "1" require madwifi-ng_r.inc # PR set after the include, to override what's set in the included file. -FILE_PR = "r1" +PR = "r1" diff --git a/packages/madwifi/madwifi-ng_r3314-20080131.bb b/packages/madwifi/madwifi-ng_r3314-20080131.bb index 3dc1ac4334..fb5cde036f 100644 --- a/packages/madwifi/madwifi-ng_r3314-20080131.bb +++ b/packages/madwifi/madwifi-ng_r3314-20080131.bb @@ -11,4 +11,4 @@ SRC_URI += " \ " # PR set after the include, to override what's set in the included file. -FILE_PR = "r6" +PR = "r6" diff --git a/packages/madwifi/madwifi-ng_r3837-20080802.bb b/packages/madwifi/madwifi-ng_r3837-20080802.bb index 84f4c6d1fa..bf14c33f83 100644 --- a/packages/madwifi/madwifi-ng_r3837-20080802.bb +++ b/packages/madwifi/madwifi-ng_r3837-20080802.bb @@ -15,4 +15,4 @@ WACKELF_SRC_URI_compulab-pxa270 = " file://20-xscale-VFP-wackelf-v2.patch;patch= SRCNAME = "madwifi-trunk" # PR set after the include, to override what's set in the included file. -FILE_PR = "r1" +PR = "r1" |