From c0fd4b06ad5269716ae9422a757a7bc7ce03186e Mon Sep 17 00:00:00 2001 From: mellor Date: Wed, 9 Jan 2013 22:28:39 +0000 Subject: [PATCH] add buildkit support for non-native pkgs, genimage_postinstall, remove Version git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@14839 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd --- xCAT-buildkit/bin/buildkit | 69 ++++++++++++++++--- .../xcat/kits/kit_template/buildkit.conf | 4 +- .../scripts/sample/genimage_post.sh | 3 + .../xcat/kits/kitcomponent.spec.template | 7 ++ 4 files changed, 72 insertions(+), 11 deletions(-) create mode 100644 xCAT-buildkit/share/xcat/kits/kit_template/scripts/sample/genimage_post.sh diff --git a/xCAT-buildkit/bin/buildkit b/xCAT-buildkit/bin/buildkit index c128448d4..989f16e4b 100755 --- a/xCAT-buildkit/bin/buildkit +++ b/xCAT-buildkit/bin/buildkit @@ -59,7 +59,6 @@ if ($^O =~ /^aix/i) { } use lib "$::XCATROOT/lib/perl"; -require xCAT::Version; require xCAT::BuildKitUtils; use Getopt::Long; use Expect; @@ -235,6 +234,12 @@ $::deploy_dir = $::build_dir; #kitname appended by validate_bldkitconf routine mandatory=>0, cp_to_kitconfig=>0}, postbootscripts => { + description=>'tbd', + value_desc=>'any string', + mandatory=>0, + base_dir=>'scripts', + cp_to_kitconfig=>2}, + genimage_postinstall => { description=>'tbd', value_desc=>'any string', mandatory=>0, @@ -312,8 +317,7 @@ if ($::HELP) # display the version statement if -v or --version is specified if ($::VERSION) { - my $version = xCAT::Version->Version(); - print "$version \n"; + print "The version option is not supported for this command. Query the xCAT-buildkit rpm for version information. \n"; exit 0; } @@ -1318,13 +1322,20 @@ sub validate_bldkitconf return 1; } } - if (defined($kc->{posupgrade})){ + if (defined($kc->{postupgrade})){ my $ck_file = $::workdir."/scripts/".$kc->{postupgrade}; if (! -r $ck_file ) { print "Post-Upgrade script $ck_file defined in Kit Componenet \"$kc->{basename}\" does not exist or is not readable\n"; return 1; } } + if (defined($kc->{genimage_postinstall})){ + my $ck_file = $::workdir."/scripts/".$kc->{genimage_postinstall}; + if (! -r $ck_file ) { + print "genimage_postinstall script $ck_file defined in Kit Componenet \"$kc->{basename}\" does not exist or is not readable\n"; + return 1; + } + } if (defined($kc->{postbootscripts})){ foreach my $script (split(/\,/, $kc->{postbootscripts})){ $script =~ s/\s+//g; @@ -1640,6 +1651,7 @@ sub build_kitcomp my $comp = shift; my %repo; my $rpmbuild_dir = $::workdir."/rpmbuild"; + my $tmpdir = $::workdir."/tmp/$comp->{basename}"; # find the kitrepo hash for this component foreach my $kr (@{$::bldkit_config->{kitrepo}{entries}}) { @@ -1652,6 +1664,7 @@ sub build_kitcomp # Create spec file for this kit component if ( &gen_kitcomp_spec($comp,\%repo) ) { return 1; } + # run the rpmbuild command my $curdir = $::workdir; my $cmd = "rm -Rf $curdir/rpmbuild"; @@ -1661,11 +1674,30 @@ sub build_kitcomp mkpath($avoiderr); my $specfile = $::workdir."/tmp/$comp->{basename}.spec"; - $cmd = "rpmbuild --define \"_topdir $rpmbuild_dir\" -ba $specfile"; - if (!$::VERBOSE) { - $cmd .= ' --quiet '; + my $rpmbuild_cmd = "rpmbuild --define \"_topdir $rpmbuild_dir\" -ba $specfile"; + + # Copy in any non-native packages + if (defined($comp->{non_native_pkgs}) ) { + mkpath($tmpdir); + mkpath("$rpmbuild_dir/SOURCES"); + my $sourcedir = $::workdir."/source_packages"; + foreach my $pkg_file (split(/,/, $comp->{non_native_pkgs})) { + $cmd = "cp -p $sourcedir/$pkg_file $tmpdir"; + if ( system($cmd) ) { + print "Error copying non-native package file $sourcedir/$pkg_file to $tmpdir\n"; + return 1; + } + } + $cmd = "cd $tmpdir/..; tar -czf $rpmbuild_dir/SOURCES/$comp->{basename}.tar.gz $comp->{basename}"; + if ( system($cmd) ) { + print "Error creating tarfile $rpmbuild_dir/SOURCES/$comp->{basename}.tar from $sourcedir/*"; + return 1; + } } - if ( system($cmd) ) { + if (!$::VERBOSE) { + $rpmbuild_cmd .= ' --quiet '; + } + if ( system($rpmbuild_cmd) ) { print "Error running rpmbuild command for kit component $comp->{basename} meta package\n"; return 1; } @@ -1717,7 +1749,9 @@ sub gen_kitcomp_spec my $kitname = $::bldkit_config->{kit}{entries}[0]->{basename}; - my ($prescript,$postscript,$preupscript,$postupscript,$preunscript,$postunscript) = ' '; + my $kitcompname = $comp->{kitcompname}; + + my ($prescript,$postscript,$preupscript,$postupscript,$preunscript,$postunscript,$nonnativepkgs,$sourcetar,$setup,$files) = ' '; if (defined($comp->{preinstall})) { $prescript = &load_script("$scriptdir$comp->{preinstall}"); $prescript = "if [ \"\$1\" = \"1\" ] ; then\n" . $prescript . "\nfi";} @@ -1734,8 +1768,18 @@ sub gen_kitcomp_spec $preunscript = &load_script("$scriptdir$comp->{preuninstall}"); } if (defined($comp->{postuninstall})) { $postunscript = &load_script("$scriptdir$comp->{postuninstall}"); } + if (defined($comp->{non_native_pkgs})) { + $nonnativepkgs = '\n'; + $nonnativepkgs .= "mkdir -p \$RPM_BUILD_ROOT/opt/xcat/kits/$kitname/$kitcompname \n"; + $nonnativepkgs .= "cp -a * \$RPM_BUILD_ROOT/opt/xcat/kits/$kitname/$kitcompname \n"; + $sourcetar = "Source: $comp->{basename}.tar.gz"; + $setup = "\%setup -q -n $comp->{basename}"; + $files = "/opt/xcat/kits"; + } + for (@lines) { + chomp; s/<<>>/$kitname/; s/<<>>/$comp->{basename}/; s/<<>>/$comp->{version}/; @@ -1744,6 +1788,10 @@ sub gen_kitcomp_spec s/<<>>/$comp->{kitpkgdeps}/; s/<<>>/$comp->{kitcompdeps}/; s/<<>>/$comp->{description}/; + s/<<>>/$nonnativepkgs/; + s/<<>>/$sourcetar/; + s/<<>>/$setup/; + s/<<>>/$files/; s/<<>>/$prescript/; s/<<>>/$postscript/; s/<<>>/$preupscript/; @@ -1836,7 +1884,8 @@ sub create_kitconf my $prefix = "$kitname"; if ( $s eq 'kitcomponent' ) { $prefix = "$::bldkit_config->{$s}{entries}[$li]->{kitcompname}"; - if ($a eq 'postbootscripts') { + if (($a eq 'postbootscripts') || + ($a eq 'genimage_postinstall')) { $prefix = "KIT_".$prefix; } } diff --git a/xCAT-buildkit/share/xcat/kits/kit_template/buildkit.conf b/xCAT-buildkit/share/xcat/kits/kit_template/buildkit.conf index 785221b33..d50f0e510 100644 --- a/xCAT-buildkit/share/xcat/kits/kit_template/buildkit.conf +++ b/xCAT-buildkit/share/xcat/kits/kit_template/buildkit.conf @@ -104,7 +104,8 @@ kitrepo: # script path relative to /scripts # Script attributes: # preinstall, postinstall, preuninstall, postuninstall, -# preupgrade, postupgrade, postbootscripts +# preupgrade, postupgrade, postbootscripts, +# genimage_postinstall kitcomponent: basename=<<>> description=description for component <<>> @@ -126,6 +127,7 @@ kitcomponent: preupgrade=sample/preup.sh postupgrade=sample/postup.sh postbootscripts=sample/postboot.sh + genimage_postinstall=sample/genimage_post.sh # kitpackage: This section defines one Kit Package, and how to build it. diff --git a/xCAT-buildkit/share/xcat/kits/kit_template/scripts/sample/genimage_post.sh b/xCAT-buildkit/share/xcat/kits/kit_template/scripts/sample/genimage_post.sh new file mode 100644 index 000000000..af4636987 --- /dev/null +++ b/xCAT-buildkit/share/xcat/kits/kit_template/scripts/sample/genimage_post.sh @@ -0,0 +1,3 @@ + +echo "running sample-comp1 genimage_post script" + diff --git a/xCAT-buildkit/share/xcat/kits/kitcomponent.spec.template b/xCAT-buildkit/share/xcat/kits/kitcomponent.spec.template index 1510a76af..3618c3e23 100644 --- a/xCAT-buildkit/share/xcat/kits/kitcomponent.spec.template +++ b/xCAT-buildkit/share/xcat/kits/kitcomponent.spec.template @@ -6,18 +6,25 @@ License: EPL BuildArch: noarch Requires: <<>>,<<>>,<<>> +<<>> +BuildRoot: /var/tmp/%{name}-%{version}-%{release}-root + %description <<>> %prep +<<>> %build %install +<<>> + %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root) +<<>> %changelog