oeqa/selftest/containerimage: update for improved cleanup

Submitted by Ross Burton on Dec. 3, 2020, 4:16 p.m. | Patch ID: 178835

Details

Message ID 20201203161611.1346206-1-ross.burton@arm.com
State New
Headers show

Commit Message

Ross Burton Dec. 3, 2020, 4:16 p.m.
ldconfig/aux-cache isn't generated anymore, and the opkg directories
are correctly removed now.

Signed-off-by: Ross Burton <ross.burton@arm.com>

---
 meta/lib/oeqa/selftest/cases/containerimage.py | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

-- 
2.25.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#145241): https://lists.openembedded.org/g/openembedded-core/message/145241
Mute This Topic: https://lists.openembedded.org/mt/78687764/3616849
Group Owner: openembedded-core+owner@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [michael@yoctoproject.org]
-=-=-=-=-=-=-=-=-=-=-=-

Patch hide | download patch | download mbox

diff --git a/meta/lib/oeqa/selftest/cases/containerimage.py b/meta/lib/oeqa/selftest/cases/containerimage.py
index 4ad7f0e654..5d498f5bf2 100644
--- a/meta/lib/oeqa/selftest/cases/containerimage.py
+++ b/meta/lib/oeqa/selftest/cases/containerimage.py
@@ -58,13 +58,7 @@  IMAGE_INSTALL_remove = "ssh-pregen-hostkeys"
                     '.{sysconfdir}/ld.so.cache',
                     '.{sysconfdir}/timestamp',
                     '.{sysconfdir}/version',
-                    './run/',
-                    '.{localstatedir}/cache/',
-                    '.{localstatedir}/cache/ldconfig/',
-                    '.{localstatedir}/cache/ldconfig/aux-cache',
-                    '.{localstatedir}/cache/opkg/',
-                    '.{localstatedir}/lib/',
-                    '.{localstatedir}/lib/opkg/'
+                    './run/'
                 ]
 
         expected_files = [ x.format(bindir=bbvars['bindir'],

Comments

Ross Burton Dec. 4, 2020, 2:07 p.m.
Argh, sorry.  Meant to run it through a selftest before posting, but forgot.

Ross

On Fri, 4 Dec 2020 at 05:04, Richard Purdie
<richard.purdie@linuxfoundation.org> wrote:
>

> On Thu, 2020-12-03 at 16:16 +0000, Ross Burton wrote:

> > ldconfig/aux-cache isn't generated anymore, and the opkg directories

> > are correctly removed now.

> >

> > Signed-off-by: Ross Burton <ross.burton@arm.com>

> > ---

> >  meta/lib/oeqa/selftest/cases/containerimage.py | 8 +-------

> >  1 file changed, 1 insertion(+), 7 deletions(-)

> >

> > diff --git a/meta/lib/oeqa/selftest/cases/containerimage.py

> > b/meta/lib/oeqa/selftest/cases/containerimage.py

> > index 4ad7f0e654..5d498f5bf2 100644

> > --- a/meta/lib/oeqa/selftest/cases/containerimage.py

> > +++ b/meta/lib/oeqa/selftest/cases/containerimage.py

> > @@ -58,13 +58,7 @@ IMAGE_INSTALL_remove = "ssh-pregen-hostkeys"

> >                      '.{sysconfdir}/ld.so.cache',

> >                      '.{sysconfdir}/timestamp',

> >                      '.{sysconfdir}/version',

> > -                    './run/',

> > -                    '.{localstatedir}/cache/',

> > -                    '.{localstatedir}/cache/ldconfig/',

> > -                    '.{localstatedir}/cache/ldconfig/aux-cache',

> > -                    '.{localstatedir}/cache/opkg/',

> > -                    '.{localstatedir}/lib/',

> > -                    '.{localstatedir}/lib/opkg/'

> > +                    './run/'

> >                  ]

> >

>

> Nearly, but:

>

> https://autobuilder.yoctoproject.org/typhoon/#/builders/80/builds/1602/steps/15/logs/stdio

>

> I've a fixup I'll test and squash in -next.

>

> Cheers,

>

> Richard

>
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#145293): https://lists.openembedded.org/g/openembedded-core/message/145293
Mute This Topic: https://lists.openembedded.org/mt/78687764/1003190
Group Owner: openembedded-core+owner@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [mhalstead@linuxfoundation.org]
-=-=-=-=-=-=-=-=-=-=-=-