From bf7d0467a0788a7fcc1c96e0dc35a25ae09278a0 Mon Sep 17 00:00:00 2001 From: Chris Larson Date: Sun, 23 May 2010 20:23:53 -0700 Subject: Rename url params patch=/pnum= to apply={yes,no}/striplevel= I think this makes the behavior rather more clear. Signed-off-by: Chris Larson Acked-by: Denys Dmytriyenko Acked-by: Khem Raj --- recipes/openldap/openldap_2.2.29.bb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'recipes/openldap/openldap_2.2.29.bb') diff --git a/recipes/openldap/openldap_2.2.29.bb b/recipes/openldap/openldap_2.2.29.bb index ba70f6e1bd..9b89a867b2 100644 --- a/recipes/openldap/openldap_2.2.29.bb +++ b/recipes/openldap/openldap_2.2.29.bb @@ -14,15 +14,15 @@ SECTION = "libs" PR = "r0" SRC_URI = "ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/${P}.tgz" -SRC_URI += "file://openldap-autoconf.patch;patch=1" +SRC_URI += "file://openldap-autoconf.patch;apply=yes" # The build tries to run a host executable, this fails. The patch # causes the executable and its data to be installed instead of # the output - ucgendat must be run after the ipkg install! -SRC_URI += "file://ucgendat.patch;patch=1" +SRC_URI += "file://ucgendat.patch;apply=yes" # The original top.mk used INSTALL, not INSTALL_STRIP_PROGRAM when # installing .so and executables, this fails in cross compilation # environments -SRC_URI += "file://install-strip.patch;patch=1" +SRC_URI += "file://install-strip.patch;apply=yes" inherit autotools -- cgit v1.2.3 From 6fe7cef27069415f2eba36bc640cf59013d4979b Mon Sep 17 00:00:00 2001 From: Chris Larson Date: Mon, 24 May 2010 13:01:00 -0700 Subject: Make the do_patch apply=yes param implicit if extension is .diff/.patch For .diff/.patch you need to apply manually, you can specify apply=no. Signed-off-by: Chris Larson Acked-by: Denys Dmytriyenko Acked-by: Khem Raj --- recipes/openldap/openldap_2.2.29.bb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'recipes/openldap/openldap_2.2.29.bb') diff --git a/recipes/openldap/openldap_2.2.29.bb b/recipes/openldap/openldap_2.2.29.bb index 9b89a867b2..8d17e47109 100644 --- a/recipes/openldap/openldap_2.2.29.bb +++ b/recipes/openldap/openldap_2.2.29.bb @@ -14,15 +14,15 @@ SECTION = "libs" PR = "r0" SRC_URI = "ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/${P}.tgz" -SRC_URI += "file://openldap-autoconf.patch;apply=yes" +SRC_URI += "file://openldap-autoconf.patch" # The build tries to run a host executable, this fails. The patch # causes the executable and its data to be installed instead of # the output - ucgendat must be run after the ipkg install! -SRC_URI += "file://ucgendat.patch;apply=yes" +SRC_URI += "file://ucgendat.patch" # The original top.mk used INSTALL, not INSTALL_STRIP_PROGRAM when # installing .so and executables, this fails in cross compilation # environments -SRC_URI += "file://install-strip.patch;apply=yes" +SRC_URI += "file://install-strip.patch" inherit autotools -- cgit v1.2.3