bug fix for quilt and sat-solver

PATCH Superseded Qing He 3 participants 11 messages Apr 13, 2011 – Apr 15, 2011

lore

Share & tools

lore

Qing He

author

2011-04-13 09:36 UTC #0 lore raw

cover bug fix for quilt and sat-solver

From: Qing He <[email protected]>

the quilt fix fixes [YOCTO #969]
the sat-solver fix is related to [YOCTO #970]

Pull URL: git://git.pokylinux.org/poky-contrib.git
Branch: qhe/fix
Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=qhe/fix

Thanks,
Qing He <[email protected]>
---

Qing He (2):
sat-solver: fix arch=all packages
quilt: fix test for target build

 .../quilt/quilt/gnu_patch_test_fix_target.patch    |   66 ++++++++++++++++++++
 meta/recipes-devtools/quilt/quilt_0.48.bb          |    6 +-
 .../sat-solver/sat-solver/sat-solver_poky.patch    |   19 ++++++
 meta/recipes-extended/sat-solver/sat-solver_git.bb |    4 +-
 4 files changed, 91 insertions(+), 4 deletions(-)
 create mode 100644 meta/recipes-devtools/quilt/quilt/gnu_patch_test_fix_target.patch

Qing He

author

2011-04-13 09:37 UTC #1 lore raw

PATCH 1/2 sat-solver: fix arch=all packages

From: Qing He <[email protected]>

add a new options to set noarch archs as all so platform independent packages can be recognized and installed.

Signed-off-by Qing He <[email protected]>

---
 .../sat-solver/sat-solver/sat-solver_poky.patch    |   19 +++++++++++++++++++
 meta/recipes-extended/sat-solver/sat-solver_git.bb |    4 ++--
 2 files changed, 21 insertions(+), 2 deletions(-)

meta/recipes-extended/sat-solver/sat-solver/sat-solver_poky.patch +19 -0

index b762bac..e055545 100644
@@ -5,8 +5,27 @@ Add a missing "any" architecture type and update the semantics to use it.
 Disable the built-in archpolicies structure, and replace it with one
 we generate in the recipe.
 
+Also add poky semantics option in CMake.
+
 Signed-off-by: Mark Hatle <[email protected]>
+Signed-off-by: Qing He <[email protected]>
 
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 443281e..4456a87 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -45,6 +45,11 @@ MESSAGE(STATUS "Building for Debian")
+ ADD_DEFINITIONS( -DDEBIAN -DDEBIAN_SEMANTICS)
+ ENDIF ( DEBIAN )
+ 
++IF ( POKY )
++MESSAGE(STATUS "Building for Poky")
++ADD_DEFINITIONS( -DPOKY -DPOKY_SEMANTICS)
++ENDIF ( POKY )
++
+ IF ( MULTI_SEMANTICS )
+ MESSAGE(STATUS "Enabling multi dist support")
+ ADD_DEFINITIONS( -DMULTI_SEMANTICS)
 diff --git a/src/knownid.h b/src/knownid.h
 index 7757ae0..4b8bee7 100644
 --- a/src/knownid.h

meta/recipes-extended/sat-solver/sat-solver_git.bb +2 -2

index a693776..0d5a5e6 100644
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.BSD;md5=62272bd11c97396d4aaf1c41bc11f7d8"
 DEPENDS = "libcheck rpm zlib expat db"
 
 PV = "0.0-git${SRCPV}"
-PR = "r8"
+PR = "r9"
 
 SRC_URI = "git://gitorious.org/opensuse/sat-solver.git;protocol=git \
            file://sat-solver_rpm5.patch \

@@ -19,7 +19,7 @@ SRC_URI = "git://gitorious.org/opensuse/sat-solver.git;protocol=git \
 
 S = "${WORKDIR}/git"
 
-EXTRA_OECMAKE += "-DLIB=lib -DRPM5=RPM5"
+EXTRA_OECMAKE += "-DLIB=lib -DRPM5=RPM5 -DPOKY=POKY"
 
 inherit cmake pkgconfig

Signature · 1 line

1.7.0

Khem Raj

2011-04-13 15:40 UTC #2 lore raw

Re: [PATCH 1/2] sat-solver: fix arch=all packages

Quoted 5 lines · Qing He

From: Qing He <[email protected]>
add a new options to set noarch archs as all so platform independent packages can be recognized and installed.

I think this patch does not belong to oe-core as it seems distro specific

Quoted 69 lines

Signed-off-by Qing He <[email protected]>
---
.../sat-solver/sat-solver/sat-solver_poky.patch | 19 +++++++++++++++++++ meta/recipes-extended/sat-solver/sat-solver_git.bb | 4 ++--
 2 files changed, 21 insertions(+), 2 deletions(-)
meta/recipes-extended/sat-solver/sat-solver/sat-solver_poky.patch +0 -0
index b762bac..e055545 100644
@@ -5,8 +5,27 @@ Add a missing "any" architecture type and update the semantics to use it.
Disable the built-in archpolicies structure, and replace it with one we generate in the recipe.
meta/recipes-extended/sat-solver/sat-solver/sat-solver_poky.patch +2 -0
+Also add poky semantics option in CMake.
+
Signed-off-by Mark Hatle <[email protected]>
meta/recipes-extended/sat-solver/sat-solver/sat-solver_poky.patch +17 -0
+Signed-off-by: Qing He <[email protected]>
 
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 443281e..4456a87 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -45,6 +45,11 @@ MESSAGE(STATUS "Building for Debian")
+ ADD_DEFINITIONS( -DDEBIAN -DDEBIAN_SEMANTICS)
+ ENDIF ( DEBIAN )
+
++IF ( POKY )
++MESSAGE(STATUS "Building for Poky")
++ADD_DEFINITIONS( -DPOKY -DPOKY_SEMANTICS)
++ENDIF ( POKY )
++
+ IF ( MULTI_SEMANTICS )
+ MESSAGE(STATUS "Enabling multi dist support")
+ ADD_DEFINITIONS( -DMULTI_SEMANTICS)
diff --git a/src/knownid.h b/src/knownid.h
index 7757ae0..4b8bee7 100644
--- a/src/knownid.h
meta/recipes-extended/sat-solver/sat-solver_git.bb +0 -0
index a693776..0d5a5e6 100644
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.BSD;md5=62272bd11c97396d4aaf1c41bc11f7d8"
DEPENDS = "libcheck rpm zlib expat db"
PV = "0.0-git${SRCPV}"
meta/recipes-extended/sat-solver/sat-solver_git.bb +1 -1
-PR = "r8"
+PR = "r9"
SRC_URI = "git://gitorious.org/opensuse/sat-solver.git;protocol=git \
file://sat-solver_rpm5.patch \
meta/recipes-extended/sat-solver/sat-solver_git.bb +0 -0
@@ -19,7 +19,7 @@ SRC_URI = "git://gitorious.org/opensuse/sat-solver.git;protocol=git \
 
S = "${WORKDIR}/git"
meta/recipes-extended/sat-solver/sat-solver_git.bb +1 -1
-EXTRA_OECMAKE += "-DLIB=lib -DRPM5=RPM5"
+EXTRA_OECMAKE += "-DLIB=lib -DRPM5=RPM5 -DPOKY=POKY"
inherit cmake pkgconfig
--
1.7.0
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

Qing He

author

2011-04-14 03:30 UTC #3 lore raw

Re: [PATCH 1/2] sat-solver: fix arch=all packages

Quoted 8 lines · Khem Raj

Quoted 5 lines · Qing He
From: Qing He <[email protected]>
add a new options to set noarch archs as all so platform independent packages can be recognized and installed.
I think this patch does not belong to oe-core as it seems distro specific

Ah, you're right. Thank you to point out.

Thanks,
Qing

Qing He

author

2011-04-13 09:36 UTC #4 lore raw

PATCH 2/2 quilt: fix test for target build

In reply to Qing He

From: Qing He <[email protected]>

fixes [YOCTO #969]

Signed-off-by Qing He <[email protected]>

---
 .../quilt/quilt/gnu_patch_test_fix_target.patch    |   66 ++++++++++++++++++++
 meta/recipes-devtools/quilt/quilt_0.48.bb          |    6 +-
 2 files changed, 70 insertions(+), 2 deletions(-)
 create mode 100644 meta/recipes-devtools/quilt/quilt/gnu_patch_test_fix_target.patch

meta/recipes-devtools/quilt/quilt/gnu_patch_test_fix_target.patch new file +66 -0

new file mode 100644
index 0000000..784fe76
@@ -0,0 +1,66 @@
+The test of patch and diff should not be run for cross build,
+rather, assume them as gnu version is rather safe. This is a
+workaround to remove it altogether.
+
+Signed-off-by: Qing He <[email protected]>
+
+diff --git a/configure.ac b/configure.ac
+index 026a36c..7b45ca4 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -245,55 +245,6 @@ fi
+ QUILT_COMPAT_PROG_PATH(DIFF, diff)
+ QUILT_COMPAT_PROG_PATH(PATCH, patch)
+ 
+-# Sun diff and others will not work because GNU patch options are used.
+-AC_MSG_CHECKING([the version of $DIFF])
+-if $DIFF --version 2>/dev/null | grep GNU >/dev/null; then
+-  set -- `$DIFF --version 2>/dev/null | $AWK '{ print $NF; exit }'`
+-  diff_version=$1
+-  AC_MSG_RESULT($diff_version)
+-  saved_IFS=$IFS; IFS='.'
+-  set -- $diff_version
+-  IFS=$saved_IFS
+-  set -- `echo $1 | $TR -cd 0-9` `echo $2 | $TR -cd 0-9`
+-  if test 0$1 -lt 2 || test 0$1 -eq 2 -a 0$2 -lt 7 ; then
+-    diff_version=
+-  fi
+-else
+-  AC_MSG_RESULT(no GNU diff)
+-fi
+-if test -z "$diff_version" ; then
+-  AC_MSG_ERROR([
+-$PACKAGE_NAME requires at least version 2.7 of GNU diffutils. You can
+-download a current version of patch from ftp.gnu.org, or if you already
+-have GNU diff then you can supply its path with the '--with-diff=' option.
+-])
+-fi
+-
+-
+-# Sun's patch, and others, do not work because GNU patch options are used.
+-AC_MSG_CHECKING([the version of $PATCH])
+-if $PATCH --version 2> /dev/null | grep GNU >/dev/null; then
+-  set -- `$PATCH --version 2> /dev/null`
+-  patch_version=$2
+-  AC_MSG_RESULT($patch_version)
+-  saved_IFS=$IFS; IFS='.'
+-  set -- $patch_version
+-  IFS=$saved_IFS
+-  set -- `echo $1 | $TR -cd 0-9` `echo $2 | $TR -cd 0-9`
+-  if test 0$1 -lt 2 || test 0$1 -eq 2 -a 0$2 -lt 4 ; then
+-    patch_version=
+-  fi
+-else
+-  AC_MSG_RESULT(no GNU patch)
+-fi
+-if test -z "$patch_version" ; then
+-  AC_MSG_ERROR([
+-$PACKAGE_NAME requires at least version 2.4 of GNU patch. You can download a
+-current version of patch from ftp.gnu.org, or if you already have GNU patch
+-then you can supply its path with the '--with-patch=' option.
+-])
+-fi
+-
+ QUILT_COMPAT_PROG_PATH(FIND, find)
+ 
+ AC_MSG_CHECKING([whether $FIND -path works])

meta/recipes-devtools/quilt/quilt_0.48.bb +4 -2

index 20a708d..124e2cd 100644
@@ -2,8 +2,10 @@ require quilt.inc
 LICENSE="GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
 RDEPENDS_${PN} += "patch diffstat bzip2 util-linux"
-PR = "r0"
-SRC_URI += "file://aclocal.patch"
+PR = "r1"
+SRC_URI += "file://aclocal.patch \
+            file://gnu_patch_test_fix_target.patch \
+           "
 
 SRC_URI[md5sum] = "f77adda60039ffa753f3c584a286f12b"
 SRC_URI[sha256sum] = "73fd760d3b5cbf06417576591dc37d67380d189392db9000c21b7cbebee49ffc"

Signature · 1 line

1.7.0

Khem Raj

2011-04-13 15:39 UTC #5 lore raw

Re: [PATCH 2/2] quilt: fix test for target build

Quoted 17 lines · Qing He

From: Qing He <[email protected]>
fixes [YOCTO #969]
Signed-off-by Qing He <[email protected]>
---
.../quilt/quilt/gnu_patch_test_fix_target.patch | 66 ++++++++++++++++++++ meta/recipes-devtools/quilt/quilt_0.48.bb | 6 +-
 2 files changed, 70 insertions(+), 2 deletions(-)
create mode 100644 meta/recipes-devtools/quilt/quilt/gnu_patch_test_fix_target.patch
meta/recipes-devtools/quilt/quilt/gnu_patch_test_fix_target.patch new file +0 -0
new file mode 100644
index 0000000..784fe76

meta/recipes-devtools/quilt/quilt/gnu_patch_test_fix_target.patch line 4

Quoted 4 lines

meta/recipes-devtools/quilt/quilt/gnu_patch_test_fix_target.patch new file +4 -0

@@ -0,0 +1,66 @@
+The test of patch and diff should not be run for cross build,
+rather, assume them as gnu version is rather safe. This is a
+workaround to remove it altogether.
+

why is this patch needed. I assume all linux distributions use GNU diff and patch
and that what is being checked so why remove the checks ? these messages are atleast useful for folks who are trying other build hosts e.g. darwin

Quoted 88 lines

meta/recipes-devtools/quilt/quilt/gnu_patch_test_fix_target.patch new file +62 -0

+Signed-off-by: Qing He <[email protected]>
+
+diff --git a/configure.ac b/configure.ac
+index 026a36c..7b45ca4 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -245,55 +245,6 @@ fi
+ QUILT_COMPAT_PROG_PATH(DIFF, diff)
+ QUILT_COMPAT_PROG_PATH(PATCH, patch)
+
+-# Sun diff and others will not work because GNU patch options are used.
+-AC_MSG_CHECKING([the version of $DIFF])
+-if $DIFF --version 2>/dev/null | grep GNU >/dev/null; then
+-  set -- `$DIFF --version 2>/dev/null | $AWK '{ print $NF; exit }'`
+-  diff_version=$1
+-  AC_MSG_RESULT($diff_version)
+-  saved_IFS=$IFS; IFS='.'
+-  set -- $diff_version
+-  IFS=$saved_IFS
+-  set -- `echo $1 | $TR -cd 0-9` `echo $2 | $TR -cd 0-9`
+-  if test 0$1 -lt 2 || test 0$1 -eq 2 -a 0$2 -lt 7 ; then
+-    diff_version=
+-  fi
+-else
+-  AC_MSG_RESULT(no GNU diff)
+-fi
+-if test -z "$diff_version" ; then
+-  AC_MSG_ERROR([
+-$PACKAGE_NAME requires at least version 2.7 of GNU diffutils. You can
+-download a current version of patch from ftp.gnu.org, or if you already
+-have GNU diff then you can supply its path with the '--with-diff=' option.
+-])
+-fi
+-
+-
+-# Sun's patch, and others, do not work because GNU patch options are used.
+-AC_MSG_CHECKING([the version of $PATCH])
+-if $PATCH --version 2> /dev/null | grep GNU >/dev/null; then
+-  set -- `$PATCH --version 2> /dev/null`
+-  patch_version=$2
+-  AC_MSG_RESULT($patch_version)
+-  saved_IFS=$IFS; IFS='.'
+-  set -- $patch_version
+-  IFS=$saved_IFS
+-  set -- `echo $1 | $TR -cd 0-9` `echo $2 | $TR -cd 0-9`
+-  if test 0$1 -lt 2 || test 0$1 -eq 2 -a 0$2 -lt 4 ; then
+-    patch_version=
+-  fi
+-else
+-  AC_MSG_RESULT(no GNU patch)
+-fi
+-if test -z "$patch_version" ; then
+-  AC_MSG_ERROR([
+-$PACKAGE_NAME requires at least version 2.4 of GNU patch. You can download a
+-current version of patch from ftp.gnu.org, or if you already have GNU patch
+-then you can supply its path with the '--with-patch=' option.
+-])
+-fi
+-
+ QUILT_COMPAT_PROG_PATH(FIND, find)
+
+ AC_MSG_CHECKING([whether $FIND -path works])

meta/recipes-devtools/quilt/quilt_0.48.bb +0 -0

index 20a708d..124e2cd 100644
@@ -2,8 +2,10 @@ require quilt.inc

LICENSE="GPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" RDEPENDS_${PN} += "patch diffstat bzip2 util-linux"

meta/recipes-devtools/quilt/quilt_0.48.bb +4 -2

-PR = "r0"
-SRC_URI += "file://aclocal.patch"
+PR = "r1"
+SRC_URI += "file://aclocal.patch \
+            file://gnu_patch_test_fix_target.patch \
+           "

SRC_URI[md5sum] = "f77adda60039ffa753f3c584a286f12b"
SRC_URI[sha256sum] = "73fd760d3b5cbf06417576591dc37d67380d189392db9000c21b7cbebee49ffc" --
1.7.0

_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

Saul Wold

2011-04-13 16:50 UTC #6 lore raw

Re: [PATCH 2/2] quilt: fix test for target build

Quoted 12 lines · Khem Raj

Quoted 11 lines · Qing He
From: Qing He<[email protected]>
fixes [YOCTO #969]
Signed-off-by Qing He<[email protected]>
---
  .../quilt/quilt/gnu_patch_test_fix_target.patch    |   66 ++++++++++++++++++++
  meta/recipes-devtools/quilt/quilt_0.48.bb          |    6 +-
  2 files changed, 70 insertions(+), 2 deletions(-)
create mode 100644 meta/recipes-devtools/quilt/quilt/gnu_patch_test_fix_target.patch

Quoted 16 lines

meta/recipes-devtools/quilt/quilt/gnu_patch_test_fix_target.patch line 4
Quoted 10 lines
meta/recipes-devtools/quilt/quilt/gnu_patch_test_fix_target.patch new file +4 -0
new file mode 100644
index 0000000..784fe76
@@ -0,0 +1,66 @@
+The test of patch and diff should not be run for cross build,
+rather, assume them as gnu version is rather safe. This is a
+workaround to remove it altogether.
+
why is this patch needed. I assume all linux distributions use GNU diff and patch
and that what is being checked so why remove the checks ? these messages are atleast useful for folks who are trying other build hosts e.g. darwin

I understand the host vs target issue, but I think a safer way would be to add a check for the version of the target patch (via a variable), this may be more upstreamable.

Also, why did you know do a recipe update which would bring in some of the upstream fixes also?

Sau!

Quoted 93 lines

Quoted 83 lines

meta/recipes-devtools/quilt/quilt/gnu_patch_test_fix_target.patch new file +62 -0

+Signed-off-by: Qing He<[email protected]>
+
+diff --git a/configure.ac b/configure.ac
+index 026a36c..7b45ca4 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -245,55 +245,6 @@ fi
+ QUILT_COMPAT_PROG_PATH(DIFF, diff)
+ QUILT_COMPAT_PROG_PATH(PATCH, patch)
+
+-# Sun diff and others will not work because GNU patch options are used.
+-AC_MSG_CHECKING([the version of $DIFF])
+-if $DIFF --version 2>/dev/null | grep GNU>/dev/null; then
+-  set -- `$DIFF --version 2>/dev/null | $AWK '{ print $NF; exit }'`
+-  diff_version=$1
+-  AC_MSG_RESULT($diff_version)
+-  saved_IFS=$IFS; IFS='.'
+-  set -- $diff_version
+-  IFS=$saved_IFS
+-  set -- `echo $1 | $TR -cd 0-9` `echo $2 | $TR -cd 0-9`
+-  if test 0$1 -lt 2 || test 0$1 -eq 2 -a 0$2 -lt 7 ; then
+-    diff_version=
+-  fi
+-else
+-  AC_MSG_RESULT(no GNU diff)
+-fi
+-if test -z "$diff_version" ; then
+-  AC_MSG_ERROR([
+-$PACKAGE_NAME requires at least version 2.7 of GNU diffutils. You can
+-download a current version of patch from ftp.gnu.org, or if you already
+-have GNU diff then you can supply its path with the '--with-diff=' option.
+-])
+-fi
+-
+-
+-# Sun's patch, and others, do not work because GNU patch options are used.
+-AC_MSG_CHECKING([the version of $PATCH])
+-if $PATCH --version 2>  /dev/null | grep GNU>/dev/null; then
+-  set -- `$PATCH --version 2>  /dev/null`
+-  patch_version=$2
+-  AC_MSG_RESULT($patch_version)
+-  saved_IFS=$IFS; IFS='.'
+-  set -- $patch_version
+-  IFS=$saved_IFS
+-  set -- `echo $1 | $TR -cd 0-9` `echo $2 | $TR -cd 0-9`
+-  if test 0$1 -lt 2 || test 0$1 -eq 2 -a 0$2 -lt 4 ; then
+-    patch_version=
+-  fi
+-else
+-  AC_MSG_RESULT(no GNU patch)
+-fi
+-if test -z "$patch_version" ; then
+-  AC_MSG_ERROR([
+-$PACKAGE_NAME requires at least version 2.4 of GNU patch. You can download a
+-current version of patch from ftp.gnu.org, or if you already have GNU patch
+-then you can supply its path with the '--with-patch=' option.
+-])
+-fi
+-
+ QUILT_COMPAT_PROG_PATH(FIND, find)
+
+ AC_MSG_CHECKING([whether $FIND -path works])

meta/recipes-devtools/quilt/quilt_0.48.bb +4 -3

index 20a708d..124e2cd 100644
@@ -2,8 +2,10 @@ require quilt.inc
  LICENSE="GPLv2"
  LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
  RDEPENDS_${PN} += "patch diffstat bzip2 util-linux"
-PR = "r0"
-SRC_URI += "file://aclocal.patch"
+PR = "r1"
+SRC_URI += "file://aclocal.patch \
+            file://gnu_patch_test_fix_target.patch \
+           "
 
  SRC_URI[md5sum] = "f77adda60039ffa753f3c584a286f12b"
  SRC_URI[sha256sum] = "73fd760d3b5cbf06417576591dc37d67380d189392db9000c21b7cbebee49ffc"
--

1.7.0

Quoted 5 lines

_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

Qing He

author

2011-04-14 02:10 UTC #7 lore raw

Re: [PATCH 2/2] quilt: fix test for target build

In reply to Khem Raj

Quoted 12 lines · Khem Raj

Quoted 11 lines · Qing He
From: Qing He <[email protected]>
fixes [YOCTO #969]
Signed-off-by Qing He <[email protected]>
---
??.../quilt/quilt/gnu_patch_test_fix_target.patch ?? ??| ?? 66 ++++++++++++++++++++ ??meta/recipes-devtools/quilt/quilt_0.48.bb ?? ?? ?? ?? ??| ?? ??6 +- ??2 files changed, 70 insertions(+), 2 deletions(-)
??create mode 100644 meta/recipes-devtools/quilt/quilt/gnu_patch_test_fix_target.patch

Quoted 15 lines

meta/recipes-devtools/quilt/quilt/gnu_patch_test_fix_target.patch line 4
Quoted 10 lines
meta/recipes-devtools/quilt/quilt/gnu_patch_test_fix_target.patch new file +4 -0
new file mode 100644
index 0000000..784fe76
@@ -0,0 +1,66 @@
+The test of patch and diff should not be run for cross build,
+rather, assume them as gnu version is rather safe. This is a
+workaround to remove it altogether.
+
why is this patch needed. I assume all linux distributions use GNU diff and patch
and that what is being checked so why remove the checks ? these messages are atleast useful for folks who are trying other build hosts e.g. darwin

Because patch is used at runtime rather than build time. It is used mainly in patch-wrapper and some other scripts.

configure.ac of quilt practically doesn't differentiate them, this leads to problems in cross-compiling:
1. the QUILT_COMPAT_PROG_PATH finds the wrong patch, say we are building on darwin with a non-GNU patch, host patch found in /usr/bin or /sw/bin is irrelevant, what should be tested is <target sysroot>/path/to/patch(which may not be /usr/bin), and then @PATCH@ should be set to a value with <target sysroot> removed.
2. the test is performed by running "patch --version", this obviously doesn't work for cross-compiling.

The right way to do this may be something like:
if test "x$cross_compiling" = "xyes"; then
AC_CHECK_PROG in target sysroot
PATCH=strip sysroot in the absolute path
else
QUILT_COPAT_PROG_PATH
original test
fi

This is troublesome and error prone, since a separate SYSROOT needs to be handled by configure, and target patch may as well not in a standard path. The simplest way to do it is to remove the test, as we have separate recipes for quilt and quilt-native.

The reason to touch this part of code is that the test itself doesn't work for newer versions of GNU patch, see:
http://lists.nongnu.org/archive/html/quilt-dev/2010-06/msg00002.html
This surely fixes the configure error, but is logically not suitable for cross compiling.

Thanks,
Qing

Khem Raj

2011-04-14 15:26 UTC #8 lore raw

Re: [PATCH 2/2] quilt: fix test for target build

Quoted 58 lines · Qing He

Quoted 12 lines · Khem Raj
Quoted 11 lines · Qing He
From: Qing He <[email protected]>
fixes [YOCTO #969]
Signed-off-by Qing He <[email protected]>
---
??.../quilt/quilt/gnu_patch_test_fix_target.patch ?? ??| ?? 66 ++++++++++++++++++++ ??meta/recipes-devtools/quilt/quilt_0.48.bb ?? ?? ?? ?? ??| ?? ??6 +- ??2 files changed, 70 insertions(+), 2 deletions(-)
??create mode 100644 meta/recipes-devtools/quilt/quilt/gnu_patch_test_fix_target.patch
Quoted 15 lines
meta/recipes-devtools/quilt/quilt/gnu_patch_test_fix_target.patch line 4
Quoted 10 lines
meta/recipes-devtools/quilt/quilt/gnu_patch_test_fix_target.patch new file +4 -0
new file mode 100644
index 0000000..784fe76
@@ -0,0 +1,66 @@
+The test of patch and diff should not be run for cross build,
+rather, assume them as gnu version is rather safe. This is a
+workaround to remove it altogether.
+
why is this patch needed. I assume all linux distributions use GNU diff and patch
and that what is being checked so why remove the checks ? these messages are atleast useful for folks who are trying other build hosts e.g. darwin
Because patch is used at runtime rather than build time. It is used mainly in patch-wrapper and some other scripts.
configure.ac of quilt practically doesn't differentiate them, this leads to problems in cross-compiling:
1. the QUILT_COMPAT_PROG_PATH finds the wrong patch, say we are building on darwin with a non-GNU patch, host patch found in /usr/bin or /sw/bin is irrelevant, what should be tested is <target sysroot>/path/to/patch(which may not be /usr/bin), and then @PATCH@ should be set to a value with <target sysroot> removed.
2. the test is performed by running "patch --version", this obviously doesn't work for cross-compiling.
The right way to do this may be something like:
if test "x$cross_compiling" = "xyes"; then
AC_CHECK_PROG in target sysroot
PATCH=strip sysroot in the absolute path
else
QUILT_COPAT_PROG_PATH
original test
fi
This is troublesome and error prone, since a separate SYSROOT needs to be handled by configure, and target patch may as well not in a standard path. The simplest way to do it is to remove the test, as we have separate recipes for quilt and quilt-native.

Quoted 5 lines

The reason to touch this part of code is that the test itself doesn't work for newer versions of GNU patch, see:
http://lists.nongnu.org/archive/html/quilt-dev/2010-06/msg00002.html
This surely fixes the configure error, but is logically not suitable for cross compiling.

As I understand you are trying to fix quilt target recipe. Then may it will be better to take the above
patch for both target and native but apply this
workaround conditionally only for target recipe

there are options --with-patch --with-diff also
there to point these utilities

Quoted 4 lines

Thanks,
Qing

Qing He

author

2011-04-15 09:28 UTC #9 lore raw

Re: [PATCH 2/2] quilt: fix test for target build

Quoted 10 lines · Khem Raj

Quoted 5 lines
The reason to touch this part of code is that the test itself doesn't work for newer versions of GNU patch, see:
??http://lists.nongnu.org/archive/html/quilt-dev/2010-06/msg00002.html This surely fixes the configure error, but is logically not suitable for cross compiling.
As I understand you are trying to fix quilt target recipe. Then may it will be better to take the above
patch for both target and native but apply this
workaround conditionally only for target recipe

This was once backported, but subsequently reverted, see:
http://git.pokylinux.org/cgit/cgit.cgi/poky/commit/?id=ec740ac770d2124cbae1ab936d85b8343076c53b

autoconf-native is not available at the point of quilt-native, so autoreconf is not desirable. This is also the reason for separation of quilt and quilt-native from the very beginning.

Apart from that, the workaround is solely for target recipe.

Quoted 3 lines

there are options --with-patch --with-diff also
there to point these utilities

The problem still lies in cross building:
--with-patch=${bindir}/patch at build time, it's /usr/bin/patch
which is host utility, if target ${bindir} /= /usr/bin, the file may not exist.

  --with-patch=${STAGING_BINDIR}/patch  causes runtime error as
                                        ${STAGING_BINDIR} leaks into target scripts

--with-patch=patch this may work, but may fail (in case
the target scripts unset PATH)

This is the problem of such tests without the concept of a target sysroot.

Thanks,
Qing

Khem Raj

2011-04-15 14:25 UTC #10 lore raw

Re: [PATCH 2/2] quilt: fix test for target build

Quoted 12 lines · Qing He

Quoted 10 lines · Khem Raj
Quoted 5 lines
The reason to touch this part of code is that the test itself doesn't work for newer versions of GNU patch, see:
??http://lists.nongnu.org/archive/html/quilt-dev/2010-06/msg00002.html This surely fixes the configure error, but is logically not suitable for cross compiling.
As I understand you are trying to fix quilt target recipe. Then may it will be better to take the above
patch for both target and native but apply this
workaround conditionally only for target recipe

Quoted 6 lines

This was once backported, but subsequently reverted, see:
http://git.pokylinux.org/cgit/cgit.cgi/poky/commit/?id=ec740ac770d2124cbae1ab936d85b8343076c53b
autoconf-native is not available at the point of quilt-native, so autoreconf is not desirable. This is also the reason for separation of quilt and quilt-native from the very beginning.

So you regenerate configure and add that to patch too along with .ac file and then it should not regenerate it.

Quoted 13 lines

Apart from that, the workaround is solely for target recipe.
Quoted 3 lines
there are options --with-patch --with-diff also
there to point these utilities
The problem still lies in cross building:
--with-patch=${bindir}/patch at build time, it's /usr/bin/patch which is host utility, if target ${bindir} /= /usr/bin, the file may not exist.

Quoted 9 lines

--with-patch=${STAGING_BINDIR}/patch causes runtime error as ${STAGING_BINDIR} leaks into target scripts
--with-patch=patch this may work, but may fail (in case the target scripts unset PATH)
This is the problem of such tests without the concept of a target sysroot.

this is fine we can apply this conditionally for target recipe.

Quoted 3 lines

Thanks,
Qing