| Submitter | Khem Raj |
|---|---|
| Date | Jan. 19, 2012, 5:39 a.m. |
| Message ID | <1326951556-18395-1-git-send-email-raj.khem@gmail.com> |
| Download | mbox | patch |
| Permalink | /patch/19689/ |
| State | Accepted |
| Commit | 8904e075d4953413edf13c43ee3a10493a6c63bb |
| Headers | show |
Comments
On 01/18/2012 09:39 PM, Khem Raj wrote: > Add -f option so if the files dont exist then we can > still continue. Fixes errors like > > | + do_configure > | + for dir in . lib libextra > | + rm ./aclocal.m4 ./m4/libtool.m4 './m4/lt*.m4' > | rm: cannot remove `./m4/libtool.m4': No such file or directory > | rm: cannot remove `./m4/lt*.m4': No such file or directory > > Signed-off-by: Khem Raj<raj.khem@gmail.com> > --- > meta/recipes-support/gnutls/gnutls.inc | 4 ++-- > 1 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/meta/recipes-support/gnutls/gnutls.inc b/meta/recipes-support/gnutls/gnutls.inc > index 5991540..c639b11 100644 > --- a/meta/recipes-support/gnutls/gnutls.inc > +++ b/meta/recipes-support/gnutls/gnutls.inc > @@ -3,7 +3,7 @@ HOMEPAGE = "http://www.gnu.org/software/gnutls/" > BUGTRACKER = "https://savannah.gnu.org/support/?group=gnutls" > DEPENDS = "zlib lzo libtasn1 libgcrypt (>= 1.4.2) libcap readline" > > -INC_PR = "r4" > +INC_PR = "r5" > > LICENSE = "GPLv3+& LGPLv2.1+" > LICENSE_${PN} = "LGPLv2.1+" > @@ -31,7 +31,7 @@ EXTRA_OECONF="--with-included-opencdk --with-included-libcfg --disable-rpath \ > " > do_configure_prepend() { > for dir in . lib libextra; do > - rm ${dir}/aclocal.m4 ${dir}/m4/libtool.m4 ${dir}/m4/lt*.m4 > + rm -f ${dir}/aclocal.m4 ${dir}/m4/libtool.m4 ${dir}/m4/lt*.m4 > done > } > Merged into OE-Core Thanks Sau!
Patch
diff --git a/meta/recipes-support/gnutls/gnutls.inc b/meta/recipes-support/gnutls/gnutls.inc index 5991540..c639b11 100644 --- a/meta/recipes-support/gnutls/gnutls.inc +++ b/meta/recipes-support/gnutls/gnutls.inc @@ -3,7 +3,7 @@ HOMEPAGE = "http://www.gnu.org/software/gnutls/" BUGTRACKER = "https://savannah.gnu.org/support/?group=gnutls" DEPENDS = "zlib lzo libtasn1 libgcrypt (>= 1.4.2) libcap readline" -INC_PR = "r4" +INC_PR = "r5" LICENSE = "GPLv3+ & LGPLv2.1+" LICENSE_${PN} = "LGPLv2.1+" @@ -31,7 +31,7 @@ EXTRA_OECONF="--with-included-opencdk --with-included-libcfg --disable-rpath \ " do_configure_prepend() { for dir in . lib libextra; do - rm ${dir}/aclocal.m4 ${dir}/m4/libtool.m4 ${dir}/m4/lt*.m4 + rm -f ${dir}/aclocal.m4 ${dir}/m4/libtool.m4 ${dir}/m4/lt*.m4 done }
Add -f option so if the files dont exist then we can still continue. Fixes errors like | + do_configure | + for dir in . lib libextra | + rm ./aclocal.m4 ./m4/libtool.m4 './m4/lt*.m4' | rm: cannot remove `./m4/libtool.m4': No such file or directory | rm: cannot remove `./m4/lt*.m4': No such file or directory Signed-off-by: Khem Raj <raj.khem@gmail.com> --- meta/recipes-support/gnutls/gnutls.inc | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)