Matthew Booth
2010-Feb-16 14:46 UTC
[Libguestfs] [PATCH 1/3] Build: Make changelog action call git directly without Git module
The changelog action needs to checkout git2cl as a submodule. For some reason,
when called through the Git module, command('submodule',
'update') was doing
something unfathomable, and different to just calling 'git submodule
update'. As
Git is just a command line wrapper anyway, I've sidestepped this by just
calling
the command directly.
---
Build.PL | 18 ++----------------
1 files changed, 2 insertions(+), 16 deletions(-)
diff --git a/Build.PL b/Build.PL
index efce5dd..51afae8 100644
--- a/Build.PL
+++ b/Build.PL
@@ -150,22 +150,8 @@ sub ACTION_changelog
return 1;
}
- # Check that git is available
- eval "use Git;";
- if($@) {
- $self->log_info("Git is not installed\n");
- return 1;
- }
-
- # Update submodules to get git2cl
- my $repo = Git->repository(Directory => '.');
-
- eval {
- $repo->command_noisy('submodule', 'update');
- };
-
- if($@) {
- $self->log_info("Failed to initialise git2cl\n");
+ unless(system("git", "submodule", "update")
== 0) {
+ $self->log_info("Failed to initialise git2cl: $@\n");
return 1;
}
--
1.6.6
Matthew Booth
2010-Feb-16 14:46 UTC
[Libguestfs] [PATCH 2/3] GuestOS: Don't attempt to install an old kernel
add_kernel was missing an _is_installed test for the kernel.
---
lib/Sys/VirtV2V/GuestOS/RedHat.pm | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/lib/Sys/VirtV2V/GuestOS/RedHat.pm
b/lib/Sys/VirtV2V/GuestOS/RedHat.pm
index 5be124c..cd2f8e6 100644
--- a/lib/Sys/VirtV2V/GuestOS/RedHat.pm
+++ b/lib/Sys/VirtV2V/GuestOS/RedHat.pm
@@ -543,6 +543,8 @@ sub add_kernel
my $path = $app->{path};
+ return undef if($self->_is_installed($path));
+
my @install;
# Install any kernel dependencies which aren't already installed
foreach my $dep (@{$app->{deps}}) {
--
1.6.6
Matthew Booth
2010-Feb-16 14:46 UTC
[Libguestfs] [PATCH 3/3] Converter: Fix virtio test for existing kernels
The existing test on a pre-installed kernel wasn't dereferencing an array,
meaning it never detected an existing kernel as virtio capable.
---
lib/Sys/VirtV2V/Converter/Linux.pm | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/lib/Sys/VirtV2V/Converter/Linux.pm
b/lib/Sys/VirtV2V/Converter/Linux.pm
index d5a93a7..87eeeb3 100644
--- a/lib/Sys/VirtV2V/Converter/Linux.pm
+++ b/lib/Sys/VirtV2V/Converter/Linux.pm
@@ -261,7 +261,7 @@ sub _configure_kernel
"virtio_net" => undef
);
- foreach my $module ($kernel->{modules}) {
+ foreach my $module (@{$kernel->{modules}}) {
if(exists($checklist{$module})) {
$checklist{$module} = 1;
}
--
1.6.6
Apparently Analagous Threads
- [PATCH] Build: Make changelog action call git directly without Git module
- [PATCH] Config: Change config to lookup dependencies by name
- [PATCH] GuestOS: Reload augeas after rpm installation and removal
- [PATCH 1/6] Convert config file to XML, and translate networks/bridge for all connections
- [PATCH] Converter: Explicitly preload sym53c8xx when running mkinitrd