[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#782894: uses-initrd/no-initrd flags are unused and set incorrectly



Package: release-notes
Severity: minor
Tags: patch

No text in the notes appears to depend on uses-initrd or no-initrd.
Also, the Linux kernel packages now use an initramfs on all
architectures.

This patch removes the related logic from the Makefile.

Ben.

-- System Information:
Debian Release: 8.0
  APT prefers unstable
  APT policy: (500, 'unstable'), (500, 'testing'), (500, 'stable'), (1, 'experimental')
Architecture: i386 (x86_64)
Foreign Architectures: amd64

Kernel: Linux 3.16.0-4-amd64 (SMP w/4 CPU cores)
Locale: LANG=en_GB.utf8, LC_CTYPE=en_GB.utf8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
Index: Makefile
===================================================================
--- Makefile	(revision 10778)
+++ Makefile	(working copy)
@@ -248,11 +248,6 @@
     condition := $(condition);g-i
 endif
 
-ifneq "$(filter $(architecture),mips mipsel)" ""
-    initrd := $(condition);no-initrd
-else
-    initrd := $(condition);uses-initrd
-endif
 # differentiate Linux and non-Linux archs
 ifneq "$(filter $(architecture),kfreebsd-i386 kfreebsd-amd64)" ""
     otherarchs := $(otherarchs);not-linux
@@ -262,7 +257,7 @@
 # pseudo-arch "all" to include all text, e.g. for proof-reading
 ifeq "$(architecture)" "all"
     otherarchs := ;$(subst  $(space),$(semic),$(arches) linux not-linux)$(otherarchs)
-    condition := $(condition);g-i;no-initrd;
+    condition := $(condition);g-i;
 endif
 
 $(LINGUA)/$(manual).$(architecture).xml: \

Reply to: