| Submitter | Saul Wold |
|---|---|
| Date | April 19, 2012, 10:44 p.m. |
| Message ID | <ad439be70f90f60d12d905c8c6546d373448ca6a.1334875218.git.sgw@linux.intel.com> |
| Download | mbox | patch |
| Permalink | /patch/26183/ |
| State | New |
| Headers | show |
Comments
On Thu, Apr 19, 2012 at 3:44 PM, Saul Wold <sgw@linux.intel.com> wrote: > The package.bbclass uses the native sysroot /usr/bin/quiltrc as an empty quiltrc > to ensure that the user quiltrc does not affect our patching scheme. This ensures > the correct file is in the correct sysroot. I assume this was meant to be patch.bbclass? Aside: ${bindir} really isn't where that should go, as a point for future improvement :)
On 04/19/2012 09:17 PM, Chris Larson wrote: > On Thu, Apr 19, 2012 at 3:44 PM, Saul Wold<sgw@linux.intel.com> wrote: >> The package.bbclass uses the native sysroot /usr/bin/quiltrc as an empty quiltrc >> to ensure that the user quiltrc does not affect our patching scheme. This ensures >> the correct file is in the correct sysroot. > > I assume this was meant to be patch.bbclass? Aside: ${bindir} really > isn't where that should go, as a point for future improvement :) Yes, patch.bbclass references $STAGING_NATIVE_BINDIR (I think that's it), Yeah, I thought about moving it, which I could still do in a second patch to the native sysroot /etc or /usr/share/quilt, this might be the better place. Thoughts? Sau!
On Thu, 2012-04-19 at 23:23 -0700, Saul Wold wrote: > On 04/19/2012 09:17 PM, Chris Larson wrote: > > On Thu, Apr 19, 2012 at 3:44 PM, Saul Wold<sgw@linux.intel.com> wrote: > >> The package.bbclass uses the native sysroot /usr/bin/quiltrc as an empty quiltrc > >> to ensure that the user quiltrc does not affect our patching scheme. This ensures > >> the correct file is in the correct sysroot. > > > > I assume this was meant to be patch.bbclass? Aside: ${bindir} really > > isn't where that should go, as a point for future improvement :) > Yes, patch.bbclass references $STAGING_NATIVE_BINDIR (I think that's > it), Yeah, I thought about moving it, which I could still do in a second > patch to the native sysroot /etc or /usr/share/quilt, this might be the > better place. > > Thoughts? I suspect that was a workaround where quilt was picking up things it shouldn't on a system and we needed a quiltrc file but didn't stage sysconfdir. I think we do stage sysconfdir for native packages now and the fact it was using /usr is just historical detail which can be removed. Looking at the history, we added sysconfdir 2.5 years ago in: http://git.yoctoproject.org/cgit.cgi/poky/commit/meta/classes/base.bbclass?id=dfd32b429a0a9bed09b75f59f0c7fb37f42c3ed9 The quiltrc fix was from two years before that: http://git.yoctoproject.org/cgit.cgi/poky/commit/?id=95554ee9b15e575a369d9686be6af45d3a6985fc http://git.yoctoproject.org/cgit.cgi/poky/commit/meta/classes/patch.bbclass?id=0443d80b50e98bb329e30430bde5db67f09004e3 Regardless, lets just have one patch which moves this somewhere sensible and makes it quilt-native only. Cheers, Richard
Patch
diff --git a/meta/recipes-devtools/quilt/quilt-0.51.inc b/meta/recipes-devtools/quilt/quilt-0.51.inc index e89013a..824e624 100644 --- a/meta/recipes-devtools/quilt/quilt-0.51.inc +++ b/meta/recipes-devtools/quilt/quilt-0.51.inc @@ -24,11 +24,6 @@ RDEPENDS_${PN} = "bash" # quilt ignores DESTDIR do_install () { oe_runmake 'BUILD_ROOT=${D}' install - if [ "${BUILD_ARCH}" == "${HOST_ARCH}" ]; then - # Dummy quiltrc file for patch.bbclass - install -d ${D}${bindir}/ - touch ${D}${bindir}/quiltrc - fi # cleanup unpackaged files rm -rf ${D}/${datadir}/emacs } diff --git a/meta/recipes-devtools/quilt/quilt-native.inc b/meta/recipes-devtools/quilt/quilt-native.inc index 7efea02..8a03a5d 100644 --- a/meta/recipes-devtools/quilt/quilt-native.inc +++ b/meta/recipes-devtools/quilt/quilt-native.inc @@ -11,3 +11,9 @@ EXTRA_OECONF = "--disable-nls" do_configure () { oe_runconf } + +do_install_append () { + # Dummy quiltrc file for patch.bbclass + install -d ${D}${bindir}/ + touch ${D}${bindir}/quiltrc +} diff --git a/meta/recipes-devtools/quilt/quilt-native_0.51.bb b/meta/recipes-devtools/quilt/quilt-native_0.51.bb index b99b9b6..1494bf2 100644 --- a/meta/recipes-devtools/quilt/quilt-native_0.51.bb +++ b/meta/recipes-devtools/quilt/quilt-native_0.51.bb @@ -1,4 +1,4 @@ require quilt-${PV}.inc require quilt-native.inc -PR = "r0" +PR = "r1" diff --git a/meta/recipes-devtools/quilt/quilt_0.51.bb b/meta/recipes-devtools/quilt/quilt_0.51.bb index bc62161..6865cd8 100644 --- a/meta/recipes-devtools/quilt/quilt_0.51.bb +++ b/meta/recipes-devtools/quilt/quilt_0.51.bb @@ -4,4 +4,4 @@ RDEPENDS_${PN} += "patch diffstat bzip2 util-linux" SRC_URI += "file://aclocal.patch \ file://gnu_patch_test_fix_target.patch \ " -PR = "r2" +PR = "r3"
The package.bbclass uses the native sysroot /usr/bin/quiltrc as an empty quiltrc to ensure that the user quiltrc does not affect our patching scheme. This ensures the correct file is in the correct sysroot. Signed-off-by: Saul Wold <sgw@linux.intel.com> --- meta/recipes-devtools/quilt/quilt-0.51.inc | 5 ----- meta/recipes-devtools/quilt/quilt-native.inc | 6 ++++++ meta/recipes-devtools/quilt/quilt-native_0.51.bb | 2 +- meta/recipes-devtools/quilt/quilt_0.51.bb | 2 +- 4 files changed, 8 insertions(+), 7 deletions(-)