| Submitter | Andreas Müller |
|---|---|
| Date | Feb. 11, 2013, 10:35 p.m. |
| Message ID | <1360622110-15419-3-git-send-email-schnitzeltony@googlemail.com> |
| Download | mbox | patch |
| Permalink | /patch/44477/ |
| State | Accepted |
| Commit | ba5d70b0d5d6d365310b995ea2544255c49e9e66 |
| Headers | show |
Comments
Please add newline before SOB line, otherwise looks good. On Mon, Feb 11, 2013 at 11:35:09PM +0100, Andreas Müller wrote: > --- > meta-oe/classes/update-fonts.bbclass | 40 ---------------------------------- > 1 files changed, 0 insertions(+), 40 deletions(-) > delete mode 100644 meta-oe/classes/update-fonts.bbclass > > diff --git a/meta-oe/classes/update-fonts.bbclass b/meta-oe/classes/update-fonts.bbclass > deleted file mode 100644 > index db2e814..0000000 > --- a/meta-oe/classes/update-fonts.bbclass > +++ /dev/null > @@ -1,40 +0,0 @@ > - > -update_fonts_postinst() { > - if [ -z "$D" ]; then > - update-fonts > - fi > -} > - > -# the same but keep it separate for now > -update_fonts_postrm() { > - if [ -z "$D" ]; then > - update-fonts > - fi > -} > - > -python populate_packages_append () { > - update_fonts_pkgs = d.getVar('UPDATE_FONTS_PACKAGES', True).split() > - > - for pkg in update_fonts_pkgs: > - postinst = d.getVar('pkg_postinst_%s' % pkg, True) or d.getVar('pkg_postinst', True) > - if not postinst: > - postinst = '#!/bin/sh\n' > - postinst += d.getVar('update_fonts_postinst', True) > - d.setVar('pkg_postinst_%s' % pkg, postinst) > - > - postrm = d.getVar('pkg_postrm_%s' % pkg, True) or d.getVar('pkg_postrm', True) > - if not postrm: > - postrm = '#!/bin/sh\n' > - postrm += d.getVar('update_fonts_postrm', True) > - d.setVar('pkg_postrm_%s' % pkg, postrm) > - > - d.appendVar('RDEPENDS_%s' % pkg, ' font-update-common') > -} > - > -python __anonymous() { > - if not bb.data.inherits_class('native', d) and not bb.data.inherits_class('cross', d): > - updatefonts_check = d.getVar('UPDATE_FONTS_PACKAGES') > - if not updatefonts_check: > - bb_filename = d.getVar('FILE') > - raise bb.build.FuncFailed, "\n\n\nERROR: %s inherits update-fonts but doesn't set UPDATE_FONTS_PACKAGES" % bb_filename > -} > -- > 1.7.4.4 > > > _______________________________________________ > Openembedded-devel mailing list > Openembedded-devel@lists.openembedded.org > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
Patch
diff --git a/meta-oe/classes/update-fonts.bbclass b/meta-oe/classes/update-fonts.bbclass deleted file mode 100644 index db2e814..0000000 --- a/meta-oe/classes/update-fonts.bbclass +++ /dev/null @@ -1,40 +0,0 @@ - -update_fonts_postinst() { - if [ -z "$D" ]; then - update-fonts - fi -} - -# the same but keep it separate for now -update_fonts_postrm() { - if [ -z "$D" ]; then - update-fonts - fi -} - -python populate_packages_append () { - update_fonts_pkgs = d.getVar('UPDATE_FONTS_PACKAGES', True).split() - - for pkg in update_fonts_pkgs: - postinst = d.getVar('pkg_postinst_%s' % pkg, True) or d.getVar('pkg_postinst', True) - if not postinst: - postinst = '#!/bin/sh\n' - postinst += d.getVar('update_fonts_postinst', True) - d.setVar('pkg_postinst_%s' % pkg, postinst) - - postrm = d.getVar('pkg_postrm_%s' % pkg, True) or d.getVar('pkg_postrm', True) - if not postrm: - postrm = '#!/bin/sh\n' - postrm += d.getVar('update_fonts_postrm', True) - d.setVar('pkg_postrm_%s' % pkg, postrm) - - d.appendVar('RDEPENDS_%s' % pkg, ' font-update-common') -} - -python __anonymous() { - if not bb.data.inherits_class('native', d) and not bb.data.inherits_class('cross', d): - updatefonts_check = d.getVar('UPDATE_FONTS_PACKAGES') - if not updatefonts_check: - bb_filename = d.getVar('FILE') - raise bb.build.FuncFailed, "\n\n\nERROR: %s inherits update-fonts but doesn't set UPDATE_FONTS_PACKAGES" % bb_filename -}