Mercurial > gub
changeset 3574:6b83151b2182
Merge branch 'gub' of git+ssh://git.sv.gnu.org/srv/git/lilypond into gub
| author | Jan Nieuwenhuizen <janneke@gnu.org> |
|---|---|
| date | Fri, 01 Jun 2007 16:41:45 +0200 |
| parents | 397f2099d14d (current diff) 2d1be47d9108 (diff) |
| children | b01dbf2d5eff |
| files | |
| diffstat | 12 files changed, 78 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/TODO Fri Jun 01 16:40:18 2007 +0200 +++ b/TODO Fri Jun 01 16:41:45 2007 +0200 @@ -45,6 +45,8 @@ LOWER PRIORITY +* do not package emtpy subpackages (doc, devel) + - replace os. calls with os.context wrapper ones (make a real dry-run to quick-test all .py scripts?)
--- a/gub/gubb.py Fri Jun 01 16:40:18 2007 +0200 +++ b/gub/gubb.py Fri Jun 01 16:41:45 2007 +0200 @@ -701,7 +701,7 @@ _verbose = '' if self.verbose: _verbose = ' -v' - self.system ('tar -C %(srcdir)s -cf- . | tar -C %(install_root)s%(_verbose)s -xf-', env=locals ()) + self.system ('tar -C %(srcdir)s -cf- . | tar -C %(install_root)s%(_verbose)s -p -xf-', env=locals ()) self.libtool_installed_la_fixups () def get_subpackage_names (self):
--- a/gub/gup.py Fri Jun 01 16:40:18 2007 +0200 +++ b/gub/gup.py Fri Jun 01 16:41:45 2007 +0200 @@ -92,7 +92,7 @@ if conflicts and not self.is_distro: raise Exception ('abort') - self.os_interface.system ('tar -C %(root)s -x%(flag)sf %(ball)s' + self.os_interface.system ('tar -C %(root)s -p -x%(flag)sf %(ball)s' % locals ()) self._package_file_db[name] = '\n'.join (lst)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/gub/specs/base-files.py Fri Jun 01 16:41:45 2007 +0200 @@ -0,0 +1,32 @@ +from gub import gubb + +url='ftp://ftp.nl.debian.org/debian/pool/main/b/base-files/base-files_4.0.0.tar.gz' + +class Base_files (gubb.BinarySpec): + def __init__ (self, settings): + gubb.BinarySpec.__init__ (self, settings) + from gub import repository + # FIXME: cannot parse debian balls + self.ball_version = '4.0.0' + self.with_tarball (mirror=url, version='') + def get_subpackage_names (self): + return [''] + def patch (self): + self.system (''' +cd %(srcdir)s && mkdir -p `cat debian/directory-list` +cd %(srcdir)s && mkdir -p usr/share/base-files +cd %(srcdir)s && mv share usr/share/base-files +cd %(srcdir)s && mv licenses usr/share/common-licenses +# from debian/rules +cd %(srcdir)s && fakeroot chown root:src usr/src +cd %(srcdir)s && fakeroot chown root:staff var/local +cd %(srcdir)s && chmod 755 `find . -type d` +cd %(srcdir)s && chmod 1777 `cat debian/1777-dirs` +cd %(srcdir)s && chmod 2775 `cat debian/2775-dirs` +cd %(srcdir)s && rm -rf debian +''') + def xinstall (self): + self.system (''' +cd %(install-root)s && fakeroot chown root:src usr/src +cd %(install_root)s && fakeroot chown root:staff var/local +''')
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/gub/specs/base-passwd.py Fri Jun 01 16:41:45 2007 +0200 @@ -0,0 +1,28 @@ +from gub import targetpackage +from gub import gubb + +url='ftp://ftp.nl.debian.org/debian/pool/main/b/base-passwd/base-passwd_3.5.11.tar.gz' + +# unneeded feeble attempt +from gub import context +class UnixBuildSpec (gubb.BuildSpec): + def patch (self): + self.shadow_tree ('%(srcdir)s', '%(builddir)s') + @context.subst_method + def configure_command (self): + return './configure --prefix=/usr' + +class Base_passwd (targetpackage.TargetBuildSpec): + def __init__ (self, settings): + targetpackage.TargetBuildSpec.__init__ (self, settings) + from gub import repository + # FIXME: cannot parse debian balls + self.ball_version = '3.5.11' + self.with_tarball (mirror=url, version='') + def get_subpackage_names (self): + return [''] + def patch (self): + self.shadow_tree ('%(srcdir)s', '%(builddir)s') + def configure_command (self): + return (targetpackage.TargetBuildSpec.configure_command (self) + .replace ('--config-cache', '--cache-file=%(builddir)s/config.cache'))
--- a/gub/specs/busybox.py Fri Jun 01 16:40:18 2007 +0200 +++ b/gub/specs/busybox.py Fri Jun 01 16:41:45 2007 +0200 @@ -9,6 +9,8 @@ def __init__ (self, settings): targetpackage.TargetBuildSpec.__init__ (self, settings) self.with_vc (repository.TarBall (self.settings.downloads, url)) + def get_subpackage_names (self): + return [''] def patch (self): self.shadow_tree ('%(srcdir)s', '%(builddir)s') pass # FIXME: no ./configure, but do not run autoupdate
--- a/gub/specs/dhcp.py Fri Jun 01 16:40:18 2007 +0200 +++ b/gub/specs/dhcp.py Fri Jun 01 16:41:45 2007 +0200 @@ -7,6 +7,8 @@ def __init__ (self, settings): targetpackage.TargetBuildSpec.__init__ (self, settings) self.with_vc (repository.TarBall (self.settings.downloads, url)) + def get_subpackage_names (self): + return [''] def patch (self): self.shadow_tree ('%(srcdir)s', '%(builddir)s') def configure_command (self):
--- a/gub/specs/dropbear.py Fri Jun 01 16:40:18 2007 +0200 +++ b/gub/specs/dropbear.py Fri Jun 01 16:41:45 2007 +0200 @@ -7,6 +7,8 @@ def __init__ (self, settings): targetpackage.TargetBuildSpec.__init__ (self, settings) self.with_vc (repository.TarBall (self.settings.downloads, url)) + def get_subpackage_names (self): + return [''] def get_build_dependencies (self): return ['zlib'] def configure (self):
--- a/gub/specs/ncurses.py Fri Jun 01 16:40:18 2007 +0200 +++ b/gub/specs/ncurses.py Fri Jun 01 16:41:45 2007 +0200 @@ -5,3 +5,5 @@ def __init__ (self, settings): targetpackage.TargetBuildSpec.__init__ (self, settings) self.with_template (mirror=mirrors.gnu, version='5.5') + def license_file (self): + return '%(srcdir)s/README'
--- a/gub/specs/psmisc.py Fri Jun 01 16:40:18 2007 +0200 +++ b/gub/specs/psmisc.py Fri Jun 01 16:41:45 2007 +0200 @@ -5,5 +5,7 @@ def __init__ (self, settings): targetpackage.TargetBuildSpec.__init__ (self, settings) self.with_template (mirror=mirrors.sf, version='22.2') + def get_subpackage_names (self): + return [''] def get_build_dependencies (self): return ['ncurses']
--- a/gub/specs/root-image.py Fri Jun 01 16:40:18 2007 +0200 +++ b/gub/specs/root-image.py Fri Jun 01 16:41:45 2007 +0200 @@ -7,8 +7,8 @@ self.with_vc (repository.Version ('1.0')) def get_build_dependencies (self): return [ - #'base-files', - #'base-passwd', + 'base-files', + 'base-passwd', 'busybox', 'dhcp', 'dropbear',
--- a/gub/specs/sysvinit.py Fri Jun 01 16:40:18 2007 +0200 +++ b/gub/specs/sysvinit.py Fri Jun 01 16:41:45 2007 +0200 @@ -7,6 +7,8 @@ def __init__ (self, settings): targetpackage.TargetBuildSpec.__init__ (self, settings) self.with_vc (repository.TarBall (self.settings.downloads, url)) + def get_subpackage_names (self): + return [''] def patch (self): self.shadow_tree ('%(srcdir)s', '%(builddir)s') def configure_command (self):