Patchwork e2fsprogs: fix packaging error for libext2fs

login
register
mail settings
Submitter Andreas Oberritter
Date May 10, 2012, 8:03 p.m.
Message ID <1336680237-31671-1-git-send-email-obi@opendreambox.org>
Download mbox | patch
Permalink /patch/27447/
State Accepted
Commit 683bc278d8695ecf4c8658ab39266279c6bf26d4
Headers show

Comments

Andreas Oberritter - May 10, 2012, 8:03 p.m.
* libext2fs is located in base_libdir, not libdir

Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
---
 .../recipes-devtools/e2fsprogs/e2fsprogs_1.42.1.bb |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
Khem Raj - May 10, 2012, 8:30 p.m.
On Thu, May 10, 2012 at 1:03 PM, Andreas Oberritter
<obi@opendreambox.org> wrote:
>
> -FILES_libext2fs = "${libdir}/e2initrd_helper ${libdir}/libext2fs.so.*"
> +FILES_libext2fs = "${libdir}/e2initrd_helper ${base_libdir}/libext2fs.so.*"

its probably not a good idea to mix files from libdir and base_libdir
in a single
package. Since lately we have been accommodating /usr to be mounted
independently.
Mark Hatle - May 10, 2012, 8:40 p.m.
On 5/10/12 3:30 PM, Khem Raj wrote:
> On Thu, May 10, 2012 at 1:03 PM, Andreas Oberritter
> <obi@opendreambox.org>  wrote:
>>
>> -FILES_libext2fs = "${libdir}/e2initrd_helper ${libdir}/libext2fs.so.*"
>> +FILES_libext2fs = "${libdir}/e2initrd_helper ${base_libdir}/libext2fs.so.*"
>
> its probably not a good idea to mix files from libdir and base_libdir
> in a single
> package. Since lately we have been accommodating /usr to be mounted
> independently.

I am assuming the e2initrd_helper is an libexec component...  Will 
libext2fs.so.* still work (during initial boot) w/o the libexec component?  (I 
am assuming it will...)

So this looks correct to me.  The split packages can have mixed base and 
prefixed components... it's the filesystem that we hope will work without the 
/usr being mounted.  But if the library requires an item in /usr, then we may 
have to move that item to /lib as well....

--Mark

> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Khem Raj - May 10, 2012, 8:48 p.m.
On Thu, May 10, 2012 at 1:40 PM, Mark Hatle <mark.hatle@windriver.com> wrote:
> On 5/10/12 3:30 PM, Khem Raj wrote:
>>
>> On Thu, May 10, 2012 at 1:03 PM, Andreas Oberritter
>> <obi@opendreambox.org>  wrote:
>>>
>>>
>>> -FILES_libext2fs = "${libdir}/e2initrd_helper ${libdir}/libext2fs.so.*"
>>> +FILES_libext2fs = "${libdir}/e2initrd_helper
>>> ${base_libdir}/libext2fs.so.*"
>>
>>
>> its probably not a good idea to mix files from libdir and base_libdir
>> in a single
>> package. Since lately we have been accommodating /usr to be mounted
>> independently.
>
>
> I am assuming the e2initrd_helper is an libexec component...  Will

but its being installed into ${libdir}/e2initrd_helper I dont think
libdir will exist initially.

> libext2fs.so.* still work (during initial boot) w/o the libexec component?
>  (I am assuming it will...)
>
> So this looks correct to me.  The split packages can have mixed base and
> prefixed components... it's the filesystem that we hope will work without
> the /usr being mounted.  But if the library requires an item in /usr, then
> we may have to move that item to /lib as well....
>
> --Mark
>
>
>> _______________________________________________
>> Openembedded-core mailing list
>> Openembedded-core@lists.openembedded.org
>> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
>
>
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Mark Hatle - May 10, 2012, 9:08 p.m.
On 5/10/12 3:48 PM, Khem Raj wrote:
> On Thu, May 10, 2012 at 1:40 PM, Mark Hatle<mark.hatle@windriver.com>  wrote:
>> On 5/10/12 3:30 PM, Khem Raj wrote:
>>>
>>> On Thu, May 10, 2012 at 1:03 PM, Andreas Oberritter
>>> <obi@opendreambox.org>    wrote:
>>>>
>>>>
>>>> -FILES_libext2fs = "${libdir}/e2initrd_helper ${libdir}/libext2fs.so.*"
>>>> +FILES_libext2fs = "${libdir}/e2initrd_helper
>>>> ${base_libdir}/libext2fs.so.*"
>>>
>>>
>>> its probably not a good idea to mix files from libdir and base_libdir
>>> in a single
>>> package. Since lately we have been accommodating /usr to be mounted
>>> independently.
>>
>>
>> I am assuming the e2initrd_helper is an libexec component...  Will
>
> but its being installed into ${libdir}/e2initrd_helper I dont think
> libdir will exist initially.

package install/image creation expects the full filesystem to be mounted.  It's 
only during boot that partial mounts may exist.

I don't know what the e2initrd_helper does.. if it's required for booting, then 
it's needed in /... (or if libext2fs can't run w/o it.)

--Mark

>> libext2fs.so.* still work (during initial boot) w/o the libexec component?
>>   (I am assuming it will...)
>>
>> So this looks correct to me.  The split packages can have mixed base and
>> prefixed components... it's the filesystem that we hope will work without
>> the /usr being mounted.  But if the library requires an item in /usr, then
>> we may have to move that item to /lib as well....
>>
>> --Mark
>>
>>
>>> _______________________________________________
>>> Openembedded-core mailing list
>>> Openembedded-core@lists.openembedded.org
>>> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
>>
>>
>>
>> _______________________________________________
>> Openembedded-core mailing list
>> Openembedded-core@lists.openembedded.org
>> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Khem Raj - May 10, 2012, 9:23 p.m.
On Thu, May 10, 2012 at 2:08 PM, Mark Hatle <mark.hatle@windriver.com> wrote:
>
> package install/image creation expects the full filesystem to be mounted.
>  It's only during boot that partial mounts may exist.
>
> I don't know what the e2initrd_helper does.. if it's required for booting,
> then it's needed in /... (or if libext2fs can't run w/o it.)

yes I was meaning the runtime here not image creation time.
Andreas Oberritter - May 10, 2012, 9:44 p.m.
On 10.05.2012 22:30, Khem Raj wrote:
> On Thu, May 10, 2012 at 1:03 PM, Andreas Oberritter
> <obi@opendreambox.org> wrote:
>>
>> -FILES_libext2fs = "${libdir}/e2initrd_helper ${libdir}/libext2fs.so.*"
>> +FILES_libext2fs = "${libdir}/e2initrd_helper ${base_libdir}/libext2fs.so.*"
> 
> its probably not a good idea to mix files from libdir and base_libdir
> in a single
> package. Since lately we have been accommodating /usr to be mounted
> independently.

I have no idea what e2initrd_helper does, but this can still be
addressed in a later patch.

Currently, libext2fs.so.* gets packaged into the "e2fsprogs" package,
which is worse than your concerns, because it drags many unneeded
dependencies into the image.

FWIW, e2initrd_helper doesn't seem to be required during a usual boot
process, as nobody seems to have missed it. At least no automatic
dependencies on the libext2fs package were generated before this patch.

Regards,
Andreas
Marko Lindqvist - May 10, 2012, 10:02 p.m.
On 11 May 2012 00:44, Andreas Oberritter <obi@opendreambox.org> wrote:
>
> I have no idea what e2initrd_helper does, but this can still be
> addressed in a later patch.

 AFAIK it's needed in initrd images only, before even rootfs has been
mounted (it's used to query some information from not-yet-mounted
rootfs)


 - ML
Saul Wold - May 11, 2012, 5:38 p.m.
On 05/10/2012 01:03 PM, Andreas Oberritter wrote:
> * libext2fs is located in base_libdir, not libdir
>
> Signed-off-by: Andreas Oberritter<obi@opendreambox.org>
> ---
>   .../recipes-devtools/e2fsprogs/e2fsprogs_1.42.1.bb |    4 ++--
>   1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.1.bb b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.1.bb
> index 6df7cea..8d4443b 100644
> --- a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.1.bb
> +++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.1.bb
> @@ -1,6 +1,6 @@
>   require e2fsprogs.inc
>
> -PR = "r0"
> +PR = "r1"
>
>   SRC_URI += "file://fallocate.patch \
>               file://acinclude.m4 \
> @@ -58,7 +58,7 @@ FILES_e2fsprogs-badblocks = "${base_sbindir}/badblocks"
>   FILES_libcomerr = "${base_libdir}/libcom_err.so.*"
>   FILES_libss = "${base_libdir}/libss.so.*"
>   FILES_libe2p = "${base_libdir}/libe2p.so.*"
> -FILES_libext2fs = "${libdir}/e2initrd_helper ${libdir}/libext2fs.so.*"
> +FILES_libext2fs = "${libdir}/e2initrd_helper ${base_libdir}/libext2fs.so.*"
>   FILES_${PN}-dev += "${datadir}/*/*.awk ${datadir}/*/*.sed ${base_libdir}/*.so"
>
>   BBCLASSEXTEND = "native"

Merged into OE-Core

Thanks
	Sau!

Patch

diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.1.bb b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.1.bb
index 6df7cea..8d4443b 100644
--- a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.1.bb
+++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.1.bb
@@ -1,6 +1,6 @@ 
 require e2fsprogs.inc
 
-PR = "r0"
+PR = "r1"
 
 SRC_URI += "file://fallocate.patch \
             file://acinclude.m4 \
@@ -58,7 +58,7 @@  FILES_e2fsprogs-badblocks = "${base_sbindir}/badblocks"
 FILES_libcomerr = "${base_libdir}/libcom_err.so.*"
 FILES_libss = "${base_libdir}/libss.so.*"
 FILES_libe2p = "${base_libdir}/libe2p.so.*"
-FILES_libext2fs = "${libdir}/e2initrd_helper ${libdir}/libext2fs.so.*"
+FILES_libext2fs = "${libdir}/e2initrd_helper ${base_libdir}/libext2fs.so.*"
 FILES_${PN}-dev += "${datadir}/*/*.awk ${datadir}/*/*.sed ${base_libdir}/*.so"
 
 BBCLASSEXTEND = "native"