diff options
| author | Leon Woestenberg <leon.woestenberg@gmail.com> | 2008-03-09 21:09:48 +0000 |
|---|---|---|
| committer | Leon Woestenberg <leon.woestenberg@gmail.com> | 2008-03-09 21:09:48 +0000 |
| commit | 656c6af32e35b87f8e9062369599b17047cbefb0 (patch) | |
| tree | 363c5aa96310783ae1038868ec9f1bfc5b63567a | |
| parent | 6d811306b54b4437df0b60983ab96970ae662ff3 (diff) | |
| parent | 8747162abd789bff370039952d12fa8ee23074d1 (diff) | |
merge of 'aa8972a1a5b088933a6f3918732ec23ff5b2edf6'
and 'eeef9d48ea3be5f822125be3f1ce20c53aa97078'
| -rw-r--r-- | conf/bitbake.conf | 9 | ||||
| -rw-r--r-- | packages/uclibc/uclibc-0.9.29/uClibc-0.9.29-nonposix_bashisms.patch | 13 | ||||
| -rw-r--r-- | packages/uclibc/uclibc_0.9.29.bb | 5 |
3 files changed, 21 insertions, 6 deletions
diff --git a/conf/bitbake.conf b/conf/bitbake.conf index c86cda5040..226f05b944 100644 --- a/conf/bitbake.conf +++ b/conf/bitbake.conf @@ -203,10 +203,11 @@ FILESDIR = "${@bb.which(bb.data.getVar('FILESPATH', d, 1), '.')}" TMPDIR = "${TOPDIR}/tmp" CACHE = "${TMPDIR}/cache${@['', '/' + str(bb.data.getVar('MACHINE', d, 1))][bool(bb.data.getVar('MACHINE', d, 1))]}" -CVSDIR = "${DL_DIR}/cvs" -SVNDIR = "${DL_DIR}/svn" -GITDIR = "${DL_DIR}/git" -BZRDIR = "${DL_DIR}/bzr" +CO_DIR = "${DL_DIR}" +CVSDIR = "${CO_DIR}/cvs" +SVNDIR = "${CO_DIR}/svn" +GITDIR = "${CO_DIR}/git" +BZRDIR = "${CO_DIR}/bzr" STAMP = "${TMPDIR}/stamps/${PF}" WORKDIR = "${TMPDIR}/work/${PF}" diff --git a/packages/uclibc/uclibc-0.9.29/uClibc-0.9.29-nonposix_bashisms.patch b/packages/uclibc/uclibc-0.9.29/uClibc-0.9.29-nonposix_bashisms.patch new file mode 100644 index 0000000000..ae03e6e48d --- /dev/null +++ b/packages/uclibc/uclibc-0.9.29/uClibc-0.9.29-nonposix_bashisms.patch @@ -0,0 +1,13 @@ +Index: uClibc-0.9.29/extra/config/lxdialog/check-lxdialog.sh +=================================================================== +--- uClibc-0.9.29.orig/extra/config/lxdialog/check-lxdialog.sh 2008-03-09 21:58:29.000000000 +0100 ++++ uClibc-0.9.29/extra/config/lxdialog/check-lxdialog.sh 2008-03-09 21:58:39.000000000 +0100 +@@ -57,7 +57,7 @@ + printf "Usage: $0 [-check compiler options|-header|-library]\n" + } + +-if [ $# == 0 ]; then ++if [ $# = 0 ]; then + usage + exit 1 + fi diff --git a/packages/uclibc/uclibc_0.9.29.bb b/packages/uclibc/uclibc_0.9.29.bb index 9051029cdf..47fec56dd1 100644 --- a/packages/uclibc/uclibc_0.9.29.bb +++ b/packages/uclibc/uclibc_0.9.29.bb @@ -7,7 +7,7 @@ # on whether the base patches apply to the selected (SRCDATE) svn release. # UCLIBC_BASE ?= "0.9.29" -PR = "r9" +PR = "r10" require uclibc.inc @@ -23,7 +23,8 @@ SRC_URI += "file://uClibc.machine file://uClibc.distro \ file://uClibc-0.9.29-fix-gethostent_r-failure-retval.patch;patch=1 \ file://uClibc-0.9.29-fix-internal_function-definition.patch;patch=1 \ file://uClibc-0.9.29-rm-whitespace.patch;patch=1 \ - " + file://uClibc-0.9.29-nonposix_bashisms.patch;patch=1 \ +" # mmap-unsigned-shift_bugid1303.patch # http://uclibc.org/lists/uclibc-cvs/2007-May/011360.html;patch=1" |