* [oe-commits] org.oe.dev package.bbclass: remove directories named in FILES from image after file [not found] <E1HBHQ2-0002RA-CZ@linuxtogo.org> @ 2007-01-28 21:30 ` Paul Sokolovsky 2007-01-28 22:09 ` Phil Blundell 0 siblings, 1 reply; 4+ messages in thread From: Paul Sokolovsky @ 2007-01-28 21:30 UTC (permalink / raw) To: Phil Blundell; +Cc: openembedded-devel Hello Phil, What's the idea behind this change? How would if handle non-empty dirs? This is a forwarded message From: pb commit <openembedded-commits@lists.openembedded.org> To: openembedded-commits@lists.openembedded.org Date: Sunday, January 28, 2007, 11:18:34 PM Subject: [oe-commits] org.oe.dev package.bbclass: remove directories named in FILES from image after file ===8<==============Original message text=============== package.bbclass: remove directories named in FILES from image after file migration Author: pb@openembedded.org Branch: org.openembedded.dev Revision: e03e452c09311f78ce177e8febeb9963f30bc1ef ViewMTN: http://monotone.openembedded.org/revision.psp?id=e03e452c09311f78ce177e8febeb9963f30bc1ef Files: 1 classes/package.bbclass Diffs: # # mt diff -r27b46e6b2f1768296232a9d2ce04946cd1d5514e -re03e452c09311f78ce177e8febeb9963f30bc1ef # # # # patch "classes/package.bbclass" # from [e59caa16e5f65d4574477c54a942e64e26296223] # to [edf00c41e2683d3180be274fedde142ed3837c83] # ============================================================ --- classes/package.bbclass e59caa16e5f65d4574477c54a942e64e26296223 +++ classes/package.bbclass edf00c41e2683d3180be274fedde142ed3837c83 @@ -387,6 +387,7 @@ python populate_packages () { bb.mkdirhier(root) filesvar = bb.data.getVar('FILES', localdata, 1) or "" files = filesvar.split() + cleandirs = [] for file in files: if os.path.isabs(file): file = '.' + file @@ -395,6 +396,7 @@ python populate_packages () { newfiles = [ os.path.join(file,x) for x in os.listdir(file) ] if newfiles: files += newfiles + cleandirs = [file] + cleandirs continue globbed = glob.glob(file) if globbed: @@ -409,6 +411,8 @@ python populate_packages () { ret = bb.movefile(file,fpath) if ret is None or ret == 0: raise bb.build.FuncFailed("File population failed") + for dir in cleandirs: + os.rmdir(dir) del localdata os.chdir(workdir) _______________________________________________ Openembedded-commits mailing list Openembedded-commits@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-commits ===8<===========End of original message text=========== -- Best regards, Paul mailto:pmiscml@gmail.com ^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [oe-commits] org.oe.dev package.bbclass: remove directories named in FILES from image after file 2007-01-28 21:30 ` [oe-commits] org.oe.dev package.bbclass: remove directories named in FILES from image after file Paul Sokolovsky @ 2007-01-28 22:09 ` Phil Blundell 2007-01-28 22:14 ` Paul Sokolovsky 0 siblings, 1 reply; 4+ messages in thread From: Phil Blundell @ 2007-01-28 22:09 UTC (permalink / raw) To: Paul Sokolovsky; +Cc: openembedded-devel There shouldn't be any non-empty dirs. If you're encountering some, that must be a bug. Do you have a testcase? p. On Sun, 2007-01-28 at 23:30 +0200, Paul Sokolovsky wrote: > Hello Phil, > > What's the idea behind this change? How would if handle non-empty > dirs? > > > This is a forwarded message > From: pb commit <openembedded-commits@lists.openembedded.org> > To: openembedded-commits@lists.openembedded.org > Date: Sunday, January 28, 2007, 11:18:34 PM > Subject: [oe-commits] org.oe.dev package.bbclass: remove directories named in FILES from image after file > > ===8<==============Original message text=============== > package.bbclass: remove directories named in FILES from image after file > migration > > Author: pb@openembedded.org > Branch: org.openembedded.dev > Revision: e03e452c09311f78ce177e8febeb9963f30bc1ef > ViewMTN: http://monotone.openembedded.org/revision.psp?id=e03e452c09311f78ce177e8febeb9963f30bc1ef > Files: > 1 > classes/package.bbclass > Diffs: > > # > # mt diff -r27b46e6b2f1768296232a9d2ce04946cd1d5514e -re03e452c09311f78ce177e8febeb9963f30bc1ef > # > # > # > # patch "classes/package.bbclass" > # from [e59caa16e5f65d4574477c54a942e64e26296223] > # to [edf00c41e2683d3180be274fedde142ed3837c83] > # > ============================================================ > --- classes/package.bbclass e59caa16e5f65d4574477c54a942e64e26296223 > +++ classes/package.bbclass edf00c41e2683d3180be274fedde142ed3837c83 > @@ -387,6 +387,7 @@ python populate_packages () { > bb.mkdirhier(root) > filesvar = bb.data.getVar('FILES', localdata, 1) or "" > files = filesvar.split() > + cleandirs = [] > for file in files: > if os.path.isabs(file): > file = '.' + file > @@ -395,6 +396,7 @@ python populate_packages () { > newfiles = [ os.path.join(file,x) for x in os.listdir(file) ] > if newfiles: > files += newfiles > + cleandirs = [file] + cleandirs > continue > globbed = glob.glob(file) > if globbed: > @@ -409,6 +411,8 @@ python populate_packages () { > ret = bb.movefile(file,fpath) > if ret is None or ret == 0: > raise bb.build.FuncFailed("File population failed") > + for dir in cleandirs: > + os.rmdir(dir) > del localdata > os.chdir(workdir) > > > > > _______________________________________________ > Openembedded-commits mailing list > Openembedded-commits@lists.openembedded.org > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-commits > > ===8<===========End of original message text=========== > > > ^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [oe-commits] org.oe.dev package.bbclass: remove directories named in FILES from image after file 2007-01-28 22:09 ` Phil Blundell @ 2007-01-28 22:14 ` Paul Sokolovsky 2007-01-28 22:22 ` Phil Blundell 0 siblings, 1 reply; 4+ messages in thread From: Paul Sokolovsky @ 2007-01-28 22:14 UTC (permalink / raw) To: Phil Blundell; +Cc: openembedded-devel Hello Phil, Monday, January 29, 2007, 12:09:52 AM, you wrote: > There shouldn't be any non-empty dirs. If you're encountering some, > that must be a bug. Do you have a testcase? Sure: I create a new .bb and just debug packaging. I'd prefer it didn't throw Python exception in my face ;-). Or: I'm sure there're few .bb which don't package all the stuff which is installed by "make install". One such example is busybox, which creates hoards of symlinks, but we don't packages (all of) them, instead relying on update-alternatives. > p. > On Sun, 2007-01-28 at 23:30 +0200, Paul Sokolovsky wrote: >> Hello Phil, >> >> What's the idea behind this change? How would if handle non-empty >> dirs? >> >> >> This is a forwarded message >> From: pb commit <openembedded-commits@lists.openembedded.org> >> To: openembedded-commits@lists.openembedded.org >> Date: Sunday, January 28, 2007, 11:18:34 PM >> Subject: [oe-commits] org.oe.dev package.bbclass: remove directories named in FILES from image after file >> >> ===8<==============Original message text=============== >> package.bbclass: remove directories named in FILES from image after file >> migration >> [] -- Best regards, Paul mailto:pmiscml@gmail.com ^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [oe-commits] org.oe.dev package.bbclass: remove directories named in FILES from image after file 2007-01-28 22:14 ` Paul Sokolovsky @ 2007-01-28 22:22 ` Phil Blundell 0 siblings, 0 replies; 4+ messages in thread From: Phil Blundell @ 2007-01-28 22:22 UTC (permalink / raw) To: Paul Sokolovsky; +Cc: openembedded-devel On Mon, 2007-01-29 at 00:14 +0200, Paul Sokolovsky wrote: > Hello Phil, > > Monday, January 29, 2007, 12:09:52 AM, you wrote: > > > There shouldn't be any non-empty dirs. If you're encountering some, > > that must be a bug. Do you have a testcase? > > Sure: I create a new .bb and just debug packaging. I'd prefer it > didn't throw Python exception in my face ;-). Or: I'm sure there're > few .bb which don't package all the stuff which is installed by > "make install". One such example is busybox, which creates hoards of > symlinks, but we don't packages (all of) them, instead relying on > update-alternatives. I just built busybox 1.2.1 and didn't see any problem. Can you be more specific about what exactly is going wrong for you? p. ^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2007-01-28 22:21 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <E1HBHQ2-0002RA-CZ@linuxtogo.org>
2007-01-28 21:30 ` [oe-commits] org.oe.dev package.bbclass: remove directories named in FILES from image after file Paul Sokolovsky
2007-01-28 22:09 ` Phil Blundell
2007-01-28 22:14 ` Paul Sokolovsky
2007-01-28 22:22 ` Phil Blundell
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.