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/ipkg | |
| 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/ipkg')
| -rw-r--r-- | packages/ipkg/ipkg-collateral.bb | 2 | ||||
| -rw-r--r-- | packages/ipkg/ipkg-native_0.99.163.bb | 2 | ||||
| -rw-r--r-- | packages/ipkg/ipkg_0.99.163.bb | 2 | ||||
| -rw-r--r-- | packages/ipkg/ipkgorphan_0.0.1.bb | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/packages/ipkg/ipkg-collateral.bb b/packages/ipkg/ipkg-collateral.bb index 7488280ad0..3fd55507e2 100644 --- a/packages/ipkg/ipkg-collateral.bb +++ b/packages/ipkg/ipkg-collateral.bb @@ -1,7 +1,7 @@ DESCRIPTION = "ipkg configuration files" SECTION = "base" LICENSE = "MIT" -FILE_PR = "r7" +PR = "r7" SRC_URI = " \ file://ipkg.conf.comments \ diff --git a/packages/ipkg/ipkg-native_0.99.163.bb b/packages/ipkg/ipkg-native_0.99.163.bb index 656e1c3f4a..dd9ff16b65 100644 --- a/packages/ipkg/ipkg-native_0.99.163.bb +++ b/packages/ipkg/ipkg-native_0.99.163.bb @@ -2,7 +2,7 @@ S = "${WORKDIR}/ipkg-${PV}" #require ipkg_${PV}.bb require ipkg-native.inc -FILE_PR = "r6" +PR = "r6" inherit autotools pkgconfig native diff --git a/packages/ipkg/ipkg_0.99.163.bb b/packages/ipkg/ipkg_0.99.163.bb index faad03eb9d..f546f6e6c8 100644 --- a/packages/ipkg/ipkg_0.99.163.bb +++ b/packages/ipkg/ipkg_0.99.163.bb @@ -1,5 +1,5 @@ include ipkg.inc -FILE_PR = "r8" +PR = "r8" S = "${WORKDIR}/ipkg-${PV}" diff --git a/packages/ipkg/ipkgorphan_0.0.1.bb b/packages/ipkg/ipkgorphan_0.0.1.bb index 81e287aef6..686f0eb5ee 100644 --- a/packages/ipkg/ipkgorphan_0.0.1.bb +++ b/packages/ipkg/ipkgorphan_0.0.1.bb @@ -5,7 +5,7 @@ SECTION = "console/applications" PRIORITY = "optional" LICENSE = "GPL" DEPENDS = "ipkg" -FILE_PR = "r1" +PR = "r1" SRC_URI = "svn://svn.projects.openmoko.org/svnroot/ipkgorphan/ipkgorphan/tags;module=${PV};rev=HEAD;proto=svn" S = "${WORKDIR}/${PV}" |