diff options
| author | Chris Larson <clarson@kergoth.com> | 2006-08-28 20:30:14 +0000 |
|---|---|---|
| committer | Chris Larson <clarson@kergoth.com> | 2006-08-28 20:30:14 +0000 |
| commit | d3c0ca658f75bf8f2aa96c51126712eb8d45c875 (patch) | |
| tree | 71f0dc44890c6004b9592936984495039d57454b /packages | |
| parent | 395ef28947528cc4cd955ae4480c2b6b5561c892 (diff) | |
Merge from poky:
Rework the way patches are handled. There are now two abstract base classes,
initialized in patch.bbclass. One for patchset operations on a directory, and
another for patch failure resolution. Currently includes 'patch' and 'quilt'
concrete PatchSet classes, and a 'user' resolver class, which simply drops you
into a shell in the source tree to fix the rejects.
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/gawk/gawk-native_3.1.4.bb | 4 | ||||
| -rw-r--r-- | packages/patcher/patcher-native_20040913.bb | 4 | ||||
| -rw-r--r-- | packages/quilt/quilt-native.inc | 3 |
3 files changed, 3 insertions, 8 deletions
diff --git a/packages/gawk/gawk-native_3.1.4.bb b/packages/gawk/gawk-native_3.1.4.bb index ba8efd1af7..0a33f71684 100644 --- a/packages/gawk/gawk-native_3.1.4.bb +++ b/packages/gawk/gawk-native_3.1.4.bb @@ -4,9 +4,7 @@ require gawk_${PV}.bb inherit native DEPENDS = "" -PATCH_DEPENDS = "" -PATCHCLEANCMD = "" -PATCHCMD = "num='%s'; name='%s'; file='%s'; patch -p "$num" -i "$file"" +PATCHTOOL = "patch" S = "${WORKDIR}/gawk-${PV}" diff --git a/packages/patcher/patcher-native_20040913.bb b/packages/patcher/patcher-native_20040913.bb index 833ca21a53..7da61e91c2 100644 --- a/packages/patcher/patcher-native_20040913.bb +++ b/packages/patcher/patcher-native_20040913.bb @@ -14,9 +14,7 @@ SRC_URI = "http://www.holgerschurig.de/files/linux/patcher-${PV}.tar.bz2" SRC_URI_append_build-freebsd = " file://freebsd_gpatch.patch;patch=1 " S = "${WORKDIR}/patcher" -PATCHCLEANCMD = "" -PATCHCMD = "num='%s'; name='%s'; file='%s'; patch -p "$num" -i "$file"" -PATCHCMD_build-freebsd = "num='%s'; name='%s'; file='%s'; gpatch -p "$num" -i "$file"" +PATCHTOOL = "patch" do_stage() { install -m 0755 patcher.py ${STAGING_BINDIR}/patcher diff --git a/packages/quilt/quilt-native.inc b/packages/quilt/quilt-native.inc index d19d864904..c8bbdc8e07 100644 --- a/packages/quilt/quilt-native.inc +++ b/packages/quilt/quilt-native.inc @@ -8,8 +8,7 @@ INHIBIT_AUTOTOOLS_DEPS = "1" inherit autotools native -PATCHCLEANCMD = "" -PATCHCMD = "num='%s'; name='%s'; file='%s'; patch -p "$num" -i "$file"" +PATCHTOOL = "patch" EXTRA_OECONF = "--disable-nls" do_configure () { |