diff options
| -rwxr-xr-x | debian/bin/gencontrol.py | 27 | ||||
| -rw-r--r-- | debian/changelog | 1 | ||||
| -rw-r--r-- | debian/config/mips/defines | 1 | ||||
| -rw-r--r-- | debian/config/mipsel/defines | 1 | ||||
| -rwxr-xr-x | debian/templates/image.plain.postinst.in | 15 | ||||
| -rwxr-xr-x | debian/templates/image.plain.postrm.in | 5 |
6 files changed, 20 insertions, 30 deletions
diff --git a/debian/bin/gencontrol.py b/debian/bin/gencontrol.py index 83cea11efa06..6d0e0fdc24bd 100755 --- a/debian/bin/gencontrol.py +++ b/debian/bin/gencontrol.py @@ -32,7 +32,6 @@ class Gencontrol(Base): 'image': { 'bootloaders': config.SchemaItemList(), 'configs': config.SchemaItemList(), - 'initramfs': config.SchemaItemBoolean(), 'initramfs-generators': config.SchemaItemList(), }, 'relations': { @@ -245,7 +244,6 @@ class Gencontrol(Base): override_localversion = config_image.get('override-localversion', None) if override_localversion is not None: vars['localversion-image'] = vars['localversion_headers'] + '-' + override_localversion - vars['initramfs'] = 'YES' if config_image.get('initramfs', True) else '' vars['image-stem'] = config_image.get('install-stem') self._setup_makeflags(self.flavour_makeflags_base, makeflags, config_base) @@ -278,19 +276,18 @@ class Gencontrol(Base): for field in 'Depends', 'Provides', 'Suggests', 'Recommends', 'Conflicts', 'Breaks': image_fields[field] = PackageRelation(config_entry_image.get(field.lower(), None), override_arches=(arch,)) - if config_entry_image.get('initramfs', True): - generators = config_entry_image['initramfs-generators'] - l = PackageRelationGroup() - for i in generators: - i = config_entry_relations.get(i, i) - l.append(i) - a = PackageRelationEntry(i) - if a.operator is not None: - a.operator = -a.operator - image_fields['Breaks'].append(PackageRelationGroup([a])) - for item in l: - item.arches = [arch] - image_fields['Depends'].append(l) + generators = config_entry_image['initramfs-generators'] + l = PackageRelationGroup() + for i in generators: + i = config_entry_relations.get(i, i) + l.append(i) + a = PackageRelationEntry(i) + if a.operator is not None: + a.operator = -a.operator + image_fields['Breaks'].append(PackageRelationGroup([a])) + for item in l: + item.arches = [arch] + image_fields['Depends'].append(l) bootloaders = config_entry_image.get('bootloaders') if bootloaders: diff --git a/debian/changelog b/debian/changelog index bb15d721b47e..8402a13f08e8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -13,6 +13,7 @@ linux (3.14.8-1) UNRELEASED; urgency=medium - O_TMPFILE support - bugfix, handling an error in opening a FIFO - propagate aufs file references to new vmas created by remap_file_pages() + * linux-image: Make initramfs support unconditional [ Aurelien Jarno ] * [arm64] Enable COMPAT to support 32-bit binaries. diff --git a/debian/config/mips/defines b/debian/config/mips/defines index 4542ab8390d1..cf975d2c40df 100644 --- a/debian/config/mips/defines +++ b/debian/config/mips/defines @@ -13,7 +13,6 @@ kernel-arch: mips image-file: vmlinux [image] -initramfs: true install-stem: vmlinux [r4k-ip22_description] diff --git a/debian/config/mipsel/defines b/debian/config/mipsel/defines index d0ef55c9a388..50ba071dc0c6 100644 --- a/debian/config/mipsel/defines +++ b/debian/config/mipsel/defines @@ -12,7 +12,6 @@ kernel-arch: mips image-file: vmlinux [image] -initramfs: true install-stem: vmlinux [sb1-bcm91250a_description] diff --git a/debian/templates/image.plain.postinst.in b/debian/templates/image.plain.postinst.in index fe8ba9b5b10e..82c92fd686de 100755 --- a/debian/templates/image.plain.postinst.in +++ b/debian/templates/image.plain.postinst.in @@ -16,7 +16,6 @@ my $link_in_boot = ""; my $no_symlink = ""; my $do_symlink = "Yes"; # target machine defined my $kimage = "@image-stem@"; -my $initrd = "@initramfs@"; my $mkimage = ""; # command to generate the initrd image my $use_hard_links = ''; # hardlinks do not work across fs boundaries my $postinst_hook = ''; #Normally we do not @@ -532,9 +531,7 @@ if (-d "$modules_base/$version") { # Only change the symlinks if we are not being upgraded if (! defined $ARGV[1] || ! $ARGV[1] || $ARGV[1] =~ m/<unknown>/o) { image_magic($kimage, $image_dest); - if ($initrd) { - image_magic("initrd.img", $image_dest); - } + image_magic("initrd.img", $image_dest); } else { lstat($kimage); @@ -542,12 +539,10 @@ else { handle_missing_link($kimage, $image_dest, "$kimage-$version", $realimageloc); } - if ($initrd) { - lstat("initrd.img"); - if (! -e _) { - handle_missing_link("initrd.img", $image_dest, "initrd.img-$version", - $realimageloc); - } + lstat("initrd.img"); + if (! -e _) { + handle_missing_link("initrd.img", $image_dest, "initrd.img-$version", + $realimageloc); } } diff --git a/debian/templates/image.plain.postrm.in b/debian/templates/image.plain.postrm.in index 016ba54891b7..3491dfab1b6b 100755 --- a/debian/templates/image.plain.postrm.in +++ b/debian/templates/image.plain.postrm.in @@ -22,7 +22,6 @@ $|=1; my $version = "@abiname@@localversion@"; my $link_in_boot = ""; my $kimage = "@image-stem@"; -my $initrd = "@initramfs@"; my $postrm_hook = ''; #Normally we do not my $package_name = "linux-image-$version"; @@ -230,8 +229,8 @@ if ($ARGV[0] !~ /upgrade/) { # check and remove damaged and dangling symlinks image_magic($kimage, $image_dest); image_magic($kimage . ".old", $image_dest); - image_magic("initrd.img", $image_dest) if $initrd; - image_magic("initrd.img.old", $image_dest) if $initrd; + image_magic("initrd.img", $image_dest); + image_magic("initrd.img.old", $image_dest); } |