diff --git a/debian/templates/temp.image.plain/postinst b/debian/templates/temp.image.plain/postinst index dba541a97..3ad0f67b8 100755 --- a/debian/templates/temp.image.plain/postinst +++ b/debian/templates/temp.image.plain/postinst @@ -46,7 +46,6 @@ my $ignore_depmod_err = ''; # normally we do not my $relink_src_link = 'YES'; # There is no harm in checking the link my $relink_build_link = 'YES'; # There is no harm in checking the link my $force_build_link = ''; # There is no harm in checking the link -my $official_image = "=OF"; # only true for official images my $arch = "=A"; # should be same as dpkg --print-installation-architecture my $kernel_arch = "=B"; my $ramdisk = "=MK"; # List of tools to create initial ram fs. @@ -969,9 +968,7 @@ LOADER: { last if $loader =~ /nettrom/i; # NETTROM does not have to be executed. last if $loader =~ /arcboot/i; # ARCBOOT does not have to be executed. last if $loader =~ /delo/i; # DELO does not have to be executed. - if ($official_image =~ /^\s*YES\s*$/o) { - last if $loader =~ /quik/i; # maintainer asked quik invocation to be ignored - } + last if $loader =~ /quik/i; # maintainer asked quik invocation to be ignored last unless $loaderloc; last unless -x $loaderloc; diff --git a/debian/templates/temp.image.plain/postrm b/debian/templates/temp.image.plain/postrm index 2b7cc4757..a2ab2c816 100755 --- a/debian/templates/temp.image.plain/postrm +++ b/debian/templates/temp.image.plain/postrm @@ -52,7 +52,6 @@ my $minimal_swap = ''; # Do not swap symlinks my $ignore_depmod_err = ''; # normally we do not my $relink_build_link = 'YES'; # There is no harm in checking the link my $force_build_link = ''; # we shall not create a dangling link -my $official_image = "=OF"; # only true for official images my $arch = "=A"; # should be same as dpkg --print-installation-architecture my $kernel_arch = "=B"; my $ramdisk = "=MK"; # List of tools to create initial ram fs. diff --git a/debian/templates/temp.image.plain/preinst b/debian/templates/temp.image.plain/preinst index 3ed584ebc..73922a882 100755 --- a/debian/templates/temp.image.plain/preinst +++ b/debian/templates/temp.image.plain/preinst @@ -38,7 +38,6 @@ my $ignore_depmod_err = ''; # normally we do not my $relink_src_link = 'YES'; # There is no harm in checking the link my $relink_build_link = 'YES'; # There is no harm in checking the link my $force_build_link = ''; # There is no harm in checking the link -my $official_image = "=OF"; # only true for official images my $arch = "=A"; # should be same as dpkg --print-installation-architecture my $kernel_arch = "=B"; my $ramdisk = "=MK"; # List of tools to create initial ram fs. @@ -164,11 +163,9 @@ if (-d "$modules_base/$version") { warn "Info:\n$errors\n" if $errors; } -if ($official_image =~ /^\s*YES\s*$/o ) { - if (-d "$modules_base/$version" && -l "$modules_base/$version/build" ) { - rename("$modules_base/$version/build", "$modules_base/$version/build.save") || - die "failed to move $modules_base/$version/build:$!"; - } +if (-d "$modules_base/$version" && -l "$modules_base/$version/build" ) { + rename("$modules_base/$version/build", "$modules_base/$version/build.save") || + die "failed to move $modules_base/$version/build:$!"; } # set the env var stem diff --git a/debian/templates/temp.image.plain/prerm b/debian/templates/temp.image.plain/prerm index d419ca10b..c80f3897a 100755 --- a/debian/templates/temp.image.plain/prerm +++ b/debian/templates/temp.image.plain/prerm @@ -39,7 +39,6 @@ my $minimal_swap = ''; # Do not swap symlinks my $ignore_depmod_err = ''; # normally we do not my $relink_build_link = 'YES'; # There is no harm in checking the link my $force_build_link = ''; # There is no harm in checking the link -my $official_image = "=OF"; # only true for official images my $arch = "=A"; # should be same as dpkg --print-installation-architecture my $kernel_arch = "=B"; my $package_name = "=ST-image-$version";