diff options
| author |   Eudyptula <eitan@mosenkis.net> | 2009-07-23 17:14:56 -0400 |
|---|---|---|
| committer | Eudyptula <eitan@mosenkis.net> | 2009-07-23 17:14:56 -0400 |
| commit | b88a57ebaeb10a1fd1ebec0959f7eeeb5fc1e888 (patch) | |
| tree | 56411c079cce9783aadf1425cc13a25a0db2fff6 /backend | |
| parent | Update todo (diff) | |
| download | ingenue-b88a57ebaeb10a1fd1ebec0959f7eeeb5fc1e888.tar.gz ingenue-b88a57ebaeb10a1fd1ebec0959f7eeeb5fc1e888.tar.bz2 ingenue-b88a57ebaeb10a1fd1ebec0959f7eeeb5fc1e888.zip | |
Use stage3 tarballs instead of doing emerge system
Diffstat (limited to 'backend')
| -rw-r--r-- | backend/modules/gentoo_portage/base-system.php | 5 | ||||
| -rw-r--r-- | backend/modules/gentoo_portage/build.php | 2 | ||||
| -rw-r--r-- | backend/modules/gentoo_portage/emerge-system.php | 10 |
3 files changed, 6 insertions, 11 deletions
diff --git a/backend/modules/gentoo_portage/base-system.php b/backend/modules/gentoo_portage/base-system.php new file mode 100644 index 0000000..df1eb26 --- /dev/null +++ b/backend/modules/gentoo_portage/base-system.php @@ -0,0 +1,5 @@ +<?php +$file=CACHE.'/stage3/'.$profile->stage3; +$opt='-xv'.(substr($file, -3) == 'bz2'?'j':'z').'f'; +execute_command('Unpack base system', "tar $opt '$file' -C '$I'"); +?> diff --git a/backend/modules/gentoo_portage/build.php b/backend/modules/gentoo_portage/build.php index 8e664e8..ad84a98 100644 --- a/backend/modules/gentoo_portage/build.php +++ b/backend/modules/gentoo_portage/build.php @@ -10,7 +10,7 @@ function gentoo_portage_build(&$build, &$opts, &$W) { require(dirname(__FILE__).'/setup.php'); // __DIR__ in 5.3.0 if ($conf['debug']) execute_command_with_env('Log portage setup', 'emerge --info', $prtg_cfgrt); - require(dirname(__FILE__).'/emerge-system.php'); // __DIR__ 5.3.0 + require(dirname(__FILE__).'/base-system.php'); // __DIR__ 5.3.0 if (in_array('timezone', $extra)) require(dirname(__FILE__).'/timezone.php'); // __DIR__ 5.3.0 if (in_array('dev-manager', $extra)) diff --git a/backend/modules/gentoo_portage/emerge-system.php b/backend/modules/gentoo_portage/emerge-system.php deleted file mode 100644 index e7165fe..0000000 --- a/backend/modules/gentoo_portage/emerge-system.php +++ /dev/null @@ -1,10 +0,0 @@ -<?php -if (is_file(CACHE.'/system-'.$profile->id.'.tar.gz') && filemtime(CACHE.'/system-'.$profile->id.'.tar.gz') > filemtime($conf['pkgdir_root'].'/'.$profile->pkgdir.'/Packages')) { - execute_command('Unpack cached base system', "tar -zxvf '".CACHE."/system-$profile->id.tar.gz' -C '$I'"); -} else { - // TODO create make.conf, make.profile in target /etc - portage_install('system', 'Install base system'); - execute_command('Cache base system for reuse', "tar -p --same-owner -czvf '$W/image.tar.gz' -C '$I' ."); - rename("$W/image.tar.gz", CACHE.'/system-'.$profile->id.'.tar.gz'); -} -?> |