[oe-commits] org.oe.dev quilt: update to quilt 0.46. Fixes 1960.
Laibsch commit
openembedded-commits at lists.openembedded.org
Mon Jan 14 23:35:05 UTC 2008
quilt: update to quilt 0.46. Fixes 1960.
* rstreamline bb
* move version 0.39 to packages/obsolete
Author: Laibsch at openembedded.org
Branch: org.openembedded.dev
Revision: 09891fc0c32d5edbc72b7bc758c18272982e4a8c
ViewMTN: http://monotone.openembedded.org/revision/info/09891fc0c32d5edbc72b7bc758c18272982e4a8c
Files:
1
packages/quilt/quilt_0.45.inc
packages/quilt/files/install.patch
packages/quilt/quilt-0.45/install.patch
packages/quilt/quilt-0.39
packages/obsolete/quilt/quilt-0.39
packages/quilt/quilt-0.45/non-gnu.patch
packages/quilt/files/non-gnu.patch
packages/quilt/quilt-native_0.39.bb
packages/obsolete/quilt/quilt-native_0.39.bb
packages/quilt/quilt_0.39.bb
packages/obsolete/quilt/quilt_0.39.bb
packages/quilt/quilt_0.39.inc
packages/obsolete/quilt/quilt_0.39.inc
packages/obsolete/quilt
packages/quilt/quilt-0.46
packages/quilt/quilt-0.46/aclocal.patch
packages/quilt/quilt-0.46/install.patch
packages/quilt/quilt-native_0.46.bb
packages/quilt/quilt_0.46.bb
packages/quilt/quilt-native.inc
packages/quilt/quilt-native_0.45.bb
packages/quilt/quilt-package.inc
packages/quilt/quilt.inc
packages/quilt/quilt_0.45.bb
Diffs:
#
# mt diff -r7a04bb3ac3dbdc2252b8d82118682825000ef65d -r09891fc0c32d5edbc72b7bc758c18272982e4a8c
#
#
#
# delete "packages/quilt/quilt_0.45.inc"
#
# rename "packages/quilt/files/install.patch"
# to "packages/quilt/quilt-0.45/install.patch"
#
# rename "packages/quilt/quilt-0.39"
# to "packages/obsolete/quilt/quilt-0.39"
#
# rename "packages/quilt/quilt-0.45/non-gnu.patch"
# to "packages/quilt/files/non-gnu.patch"
#
# rename "packages/quilt/quilt-native_0.39.bb"
# to "packages/obsolete/quilt/quilt-native_0.39.bb"
#
# rename "packages/quilt/quilt_0.39.bb"
# to "packages/obsolete/quilt/quilt_0.39.bb"
#
# rename "packages/quilt/quilt_0.39.inc"
# to "packages/obsolete/quilt/quilt_0.39.inc"
#
# add_dir "packages/obsolete/quilt"
#
# add_dir "packages/quilt/quilt-0.46"
#
# add_file "packages/quilt/quilt-0.46/aclocal.patch"
# content [ccc9f868c7adc5563ec7c822d1612d06662d62f0]
#
# add_file "packages/quilt/quilt-0.46/install.patch"
# content [b821f6cd66eca792042c080bc1e0e8410ede1e41]
#
# add_file "packages/quilt/quilt-native_0.46.bb"
# content [1b9a395ef79efd98777f42c6b6d0a14688f00c8f]
#
# add_file "packages/quilt/quilt_0.46.bb"
# content [3045f450628e75b65e19e531f085bd587c17bf41]
#
# patch "packages/quilt/quilt-native.inc"
# from [8745ec800da185c3a83b466b7265c099e2ff3d3d]
# to [367967333d8a9ba352ec4ff387843a19293b7c2c]
#
# patch "packages/quilt/quilt-native_0.45.bb"
# from [2331affab68253b1fa2bc9cb673aba72b45e9eb0]
# to [1b9a395ef79efd98777f42c6b6d0a14688f00c8f]
#
# patch "packages/quilt/quilt-package.inc"
# from [6c3059863a33e504cbe199c672100fa271383b5f]
# to [a242c39bf9c9973c0f64ad7a6e1d5cf3892f09fc]
#
# patch "packages/quilt/quilt.inc"
# from [3fcab8b0e414d12021ebd2b2f40168412f4ad8d0]
# to [ba830afc24cbfc119251f97b3fe64e37bb5c7dfd]
#
# patch "packages/quilt/quilt_0.45.bb"
# from [8f756223ce9e287788362df20a70a06d5c21b2c0]
# to [3045f450628e75b65e19e531f085bd587c17bf41]
#
============================================================
--- packages/quilt/quilt-0.46/aclocal.patch ccc9f868c7adc5563ec7c822d1612d06662d62f0
+++ packages/quilt/quilt-0.46/aclocal.patch ccc9f868c7adc5563ec7c822d1612d06662d62f0
@@ -0,0 +1,126 @@
+Add the aclocal.m4 as acinclude.m4
+
+Index: quilt-0.46/acinclude.m4
+===================================================================
+--- /dev/null
++++ quilt-0.46/acinclude.m4
+@@ -0,0 +1,119 @@
++dnl Allow configure to specify a specific binary
++dnl 1: Environment variable
++dnl 2: binary name
++dnl 3: optional list of alternative binary names
++dnl 4: optional list of additional search directories
++AC_DEFUN([QUILT_COMPAT_PROG_PATH],[
++ m4_define([internal_$2_cmd],[esyscmd(ls compat/$2.in 2>/dev/null)])
++
++ AC_ARG_WITH($2, AC_HELP_STRING(
++ [--with-$2], [name of the $2 executable to use]
++ m4_if(internal_$2_cmd,[],[],[ (use --without-$2
++ to use an internal mechanism)])),
++ [
++ if test x"$withval" = xnone; then
++ AC_MSG_ERROR([Invalid configure argument. use --without-$2])
++ fi
++ if test x"$withval" != xno; then
++ AC_MSG_CHECKING(for $2)
++ $1="$withval"
++ if test -e "$$1"; then
++ if test ! -f "$$1" -a ! -h "$$1" || test ! -x "$$1"; then
++ AC_MSG_ERROR([$$1 is not an executable file])
++ fi
++ fi
++ AC_MSG_RESULT([$$1])
++ if test ! -e "$$1"; then
++ AC_MSG_WARN([$$1 does not exist])
++ fi
++ COMPAT_SYMLINKS="$COMPAT_SYMLINKS $2"
++ fi
++ ],[
++ m4_if([$3],[],[
++ AC_PATH_PROG($1,$2,,$PATH:$4)
++ ],[
++ AC_PATH_PROGS($1,$3,,$PATH:$4)
++ if test -n "$$1" -a "`expr "$$1" : '.*/\([[^/]]*\)$'`" != "$2"; then
++ COMPAT_SYMLINKS="$COMPAT_SYMLINKS $2"
++ fi
++ ])
++ m4_if([$4],[],[],[
++ if test -n "$$1"; then
++ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++ for dir in "$4"; do
++ if test "`dirname $$1`" = "$dir"; then
++ COMPAT_SYMLINKS="$COMPAT_SYMLINKS $2"
++ break
++ fi
++ done
++ IFS="$as_save_IFS"
++ fi
++ ])
++ ])
++ if test -z "$$1"; then
++ m4_if(internal_$2_cmd,[],[
++ AC_MSG_ERROR([Please specify the location of $2 with the option '--with-$2'])
++ ],[
++ AC_MSG_WARN([Using internal $2 mechanism. Use option '--with-$2' to override])
++ COMPAT_PROGRAMS="$COMPAT_PROGRAMS $2"
++ $1=$2
++ INTERNAL_$1=1
++ ])
++ fi
++ AC_SUBST($1)
++])
++
++dnl Allow configure to specify a specific binary
++dnl This variant is for optional binaries.
++dnl 1: Environment variable
++dnl 2: binary name
++dnl 3: optional list of alternative binary names
++dnl 4: optional list of additional search directories
++AC_DEFUN([QUILT_COMPAT_PROG_PATH_OPT],[
++ AC_ARG_WITH($2, AC_HELP_STRING(
++ [--with-$2], [name of the $2 executable to use]),
++ [
++ if test x"$withval" != xno; then
++ AC_MSG_CHECKING(for $2)
++ $1="$withval"
++ if test -e "$$1"; then
++ if test ! -f "$$1" -a ! -h "$$1" || test ! -x "$$1"; then
++ AC_MSG_ERROR([$$1 is not an executable file])
++ fi
++ fi
++ AC_MSG_RESULT([$$1])
++ if test ! -e "$$1"; then
++ AC_MSG_WARN([$$1 does not exist])
++ fi
++ COMPAT_SYMLINKS="$COMPAT_SYMLINKS $2"
++ fi
++ ],[
++ m4_if([$3],[],[
++ AC_PATH_PROG($1,$2,,$PATH:$4)
++ ],[
++ AC_PATH_PROGS($1,$3,,$PATH:$4)
++ if test -n "$$1" -a "`expr "$$1" : '.*/\([[^/]]*\)$'`" != "$2"; then
++ COMPAT_SYMLINKS="$COMPAT_SYMLINKS $2"
++ fi
++ ])
++ m4_if([$4],[],[],[
++ if test -n "$$1"; then
++ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++ for dir in "$4"; do
++ if test "`dirname $$1`" = "$dir"; then
++ COMPAT_SYMLINKS="$COMPAT_SYMLINKS $2"
++ break
++ fi
++ done
++ IFS="$as_save_IFS"
++ fi
++ ])
++ if test -z "$$1"; then
++ AC_MSG_WARN([$2 not found, some optional functionalities will be missing])
++ fi
++ ])
++ if test -z "$$1"; then
++ $1=$2
++ fi
++ AC_SUBST($1)
++])
============================================================
--- packages/quilt/quilt-0.46/install.patch b821f6cd66eca792042c080bc1e0e8410ede1e41
+++ packages/quilt/quilt-0.46/install.patch b821f6cd66eca792042c080bc1e0e8410ede1e41
@@ -0,0 +1,13 @@
+Index: quilt-0.46/Makefile.in
+===================================================================
+--- quilt-0.46.orig/Makefile.in
++++ quilt-0.46/Makefile.in
+@@ -12,7 +12,7 @@ datadir := @datadir@
+ docdir := @docdir@
+ mandir := @mandir@
+ localedir := $(datadir)/locale
+-etcdir := $(subst /usr/etc,/etc,$(prefix)/etc)
++etcdir := @sysconfdir@
+
+ INSTALL := @INSTALL@
+ POD2MAN := @POD2MAN@
============================================================
--- packages/quilt/quilt-native_0.46.bb 1b9a395ef79efd98777f42c6b6d0a14688f00c8f
+++ packages/quilt/quilt-native_0.46.bb 1b9a395ef79efd98777f42c6b6d0a14688f00c8f
@@ -0,0 +1 @@
+require quilt-native.inc
============================================================
--- packages/quilt/quilt_0.46.bb 3045f450628e75b65e19e531f085bd587c17bf41
+++ packages/quilt/quilt_0.46.bb 3045f450628e75b65e19e531f085bd587c17bf41
@@ -0,0 +1 @@
+require quilt-package.inc
============================================================
--- packages/quilt/quilt-native.inc 8745ec800da185c3a83b466b7265c099e2ff3d3d
+++ packages/quilt/quilt-native.inc 367967333d8a9ba352ec4ff387843a19293b7c2c
@@ -1,4 +1,4 @@
-require quilt_${PV}.inc
+require quilt.inc
SRC_URI_append_build-darwin = "? file://non-gnu.patch;patch=1 "
RDEPENDS_${PN} = "diffstat-native patch-native bzip2-native util-linux-native"
============================================================
--- packages/quilt/quilt-native_0.45.bb 2331affab68253b1fa2bc9cb673aba72b45e9eb0
+++ packages/quilt/quilt-native_0.45.bb 1b9a395ef79efd98777f42c6b6d0a14688f00c8f
@@ -1,2 +1 @@
-PV="0.45"
require quilt-native.inc
============================================================
--- packages/quilt/quilt-package.inc 6c3059863a33e504cbe199c672100fa271383b5f
+++ packages/quilt/quilt-package.inc a242c39bf9c9973c0f64ad7a6e1d5cf3892f09fc
@@ -1,10 +1,21 @@
+require quilt.inc
+
+RDEPENDS_${PN} += "patch diffstat bzip2 util-linux"
+
+SRC_URI += "file://aclocal.patch;patch=1"
+
+inherit autotools gettext
+
+do_install () {
+ oe_runmake 'BUILD_ROOT=${D}' install
+
+ # Remove the compat symlinks
+ rm -rf "${D}"/usr/share/quilt/compat
+}
+
PACKAGES += "guards guards-doc"
FILES_${PN} = "${sysconfdir} ${datadir}/quilt \
${bindir}/quilt ${libdir}/quilt"
FILES_guards = "${bindir}/guards"
FILES_${PN}-doc = "${mandir}/man1/quilt.1 ${docdir}/${P}"
FILES_guards-doc = "${mandir}/man1/guards.1"
-
-do_install () {
- oe_runmake 'BUILD_ROOT=${D}' install
-}
============================================================
--- packages/quilt/quilt.inc 3fcab8b0e414d12021ebd2b2f40168412f4ad8d0
+++ packages/quilt/quilt.inc ba830afc24cbfc119251f97b3fe64e37bb5c7dfd
@@ -1,9 +1,10 @@ LICENSE = "GPL"
DESCRIPTION = "Tool to work with series of patches."
HOMEPAGE = "http://savannah.nongnu.org/projects/quilt/"
SECTION = "devel"
LICENSE = "GPL"
-PR = "r1"
+PR = "r2"
-SRC_URI = "http://download.savannah.gnu.org/releases/quilt/quilt-${PV}.tar.gz "
+SRC_URI = "http://download.savannah.gnu.org/releases/quilt/quilt-${PV}.tar.gz \
+ file://install.patch;patch=1"
S = "${WORKDIR}/quilt-${PV}"
============================================================
--- packages/quilt/quilt_0.45.bb 8f756223ce9e287788362df20a70a06d5c21b2c0
+++ packages/quilt/quilt_0.45.bb 3045f450628e75b65e19e531f085bd587c17bf41
@@ -1,9 +1 @@
-RDEPENDS_${PN} += "patch diffstat bzip2 util-linux"
-
-require quilt_${PV}.inc
-
-SRC_URI += "file://aclocal.patch;patch=1"
-
-inherit autotools gettext
-
require quilt-package.inc
More information about the Openembedded-commits
mailing list