diff options
-rw-r--r-- | build/arch-options/amd64 | 2 | ||||
-rw-r--r-- | build/arch-options/arm64 | 2 | ||||
-rw-r--r-- | build/arch-options/armel | 2 | ||||
-rw-r--r-- | build/arch-options/armhf | 2 | ||||
-rw-r--r-- | build/arch-options/hppa | 2 | ||||
-rw-r--r-- | build/arch-options/hurd-i386 | 2 | ||||
-rw-r--r-- | build/arch-options/i386 | 2 | ||||
-rw-r--r-- | build/arch-options/ia64 | 2 | ||||
-rw-r--r-- | build/arch-options/kfreebsd-amd64 | 2 | ||||
-rw-r--r-- | build/arch-options/kfreebsd-i386 | 2 | ||||
-rw-r--r-- | build/arch-options/mips | 2 | ||||
-rw-r--r-- | build/arch-options/mips64el | 2 | ||||
-rw-r--r-- | build/arch-options/mipsel | 2 | ||||
-rw-r--r-- | build/arch-options/powerpc | 2 | ||||
-rw-r--r-- | build/arch-options/ppc64el | 2 | ||||
-rw-r--r-- | build/arch-options/s390 | 2 | ||||
-rw-r--r-- | build/arch-options/s390x | 2 | ||||
-rw-r--r-- | build/arch-options/sparc | 2 | ||||
-rwxr-xr-x | build/buildone.sh | 1 | ||||
-rwxr-xr-x | build/buildone_ng.sh | 1 | ||||
-rw-r--r-- | debian/changelog | 1 | ||||
-rw-r--r-- | en/preparing/minimum-hardware-reqts.xml | 14 |
22 files changed, 48 insertions, 5 deletions
diff --git a/build/arch-options/amd64 b/build/arch-options/amd64 index 8ceaa66ad..db9f6376d 100644 --- a/build/arch-options/amd64 +++ b/build/arch-options/amd64 @@ -6,6 +6,8 @@ archspec="amd64;any-amd64;x86;any-x86;not-s390;not-powerpc" arch_listname="amd64" arch_porturl="amd64" # This is coming from the lowmem package +minimum_memory_strict=170 +# This is coming from the lowmem package minimum_memory=550 # This is coming from the rootskel package, S60frontend minimum_memory_gtk=800 diff --git a/build/arch-options/arm64 b/build/arch-options/arm64 index bb6d8e1af..757d7a9ed 100644 --- a/build/arch-options/arm64 +++ b/build/arch-options/arm64 @@ -10,6 +10,8 @@ archspec="arm;arm64;not-x86;not-s390;not-powerpc" arch_listname="arm" arch_porturl="arm" # This is coming from the lowmem package +minimum_memory_strict=32 +# This is coming from the lowmem package minimum_memory=80 # These two options should be set if condition 'smp' is set below smp_config_section="Kernel Features" diff --git a/build/arch-options/armel b/build/arch-options/armel index 3170f792b..c04f4fad2 100644 --- a/build/arch-options/armel +++ b/build/arch-options/armel @@ -10,6 +10,8 @@ archspec="arm;armel;not-x86;not-s390;not-powerpc" arch_listname="arm" arch_porturl="arm" # This is coming from the lowmem package +minimum_memory_strict=32 +# This is coming from the lowmem package minimum_memory=80 # These two options should be set if condition 'smp' is set below smp_config_section="N/A" diff --git a/build/arch-options/armhf b/build/arch-options/armhf index abb4105eb..05e720ef6 100644 --- a/build/arch-options/armhf +++ b/build/arch-options/armhf @@ -10,6 +10,8 @@ archspec="arm;armhf;not-x86;not-s390;not-powerpc" arch_listname="arm" arch_porturl="arm" # This is coming from the lowmem package +minimum_memory_strict=32 +# This is coming from the lowmem package minimum_memory=80 # These two options should be set if condition 'smp' is set below smp_config_section="Kernel Features" diff --git a/build/arch-options/hppa b/build/arch-options/hppa index 75d517e43..73033c78b 100644 --- a/build/arch-options/hppa +++ b/build/arch-options/hppa @@ -6,6 +6,8 @@ archspec="hppa;not-x86;not-s390;not-powerpc" arch_listname="hppa" arch_porturl="hppa" # This is coming from the lowmem package +minimum_memory_strict=32 +# This is coming from the lowmem package minimum_memory=64 # These two options should be set if condition 'smp' is set below smp_config_section="Processor type and features" diff --git a/build/arch-options/hurd-i386 b/build/arch-options/hurd-i386 index 6953314f5..0b341aeb6 100644 --- a/build/arch-options/hurd-i386 +++ b/build/arch-options/hurd-i386 @@ -6,6 +6,8 @@ archspec="hurd-i386;any-i386;any-x86;not-x86;not-s390;not-powerpc" arch_listname="hurd" arch_porturl="hurd" # This is coming from the lowmem package +minimum_memory_strict=390 +# This is coming from the lowmem package minimum_memory=500 # This is coming from the rootskel package, S60frontend minimum_memory_gtk=750 diff --git a/build/arch-options/i386 b/build/arch-options/i386 index af7c055ae..4cb7d5316 100644 --- a/build/arch-options/i386 +++ b/build/arch-options/i386 @@ -6,6 +6,8 @@ archspec="i386;any-i386;x86;any-x86;not-s390;not-powerpc" arch_listname="boot" arch_porturl="i386" # This is coming from the lowmem package +minimum_memory_strict=120 +# This is coming from the lowmem package minimum_memory=400 # This is coming from the rootskel package, S60frontend minimum_memory_gtk=550 diff --git a/build/arch-options/ia64 b/build/arch-options/ia64 index 1acb689b4..baf322f79 100644 --- a/build/arch-options/ia64 +++ b/build/arch-options/ia64 @@ -7,6 +7,8 @@ arch_listname="ia64" arch_porturl="ia64" # TODO: update # This is coming from the lowmem package +minimum_memory_strict=32 +# This is coming from the lowmem package minimum_memory=64 # These two options should be set if condition 'smp' is set below smp_config_section="General setup" diff --git a/build/arch-options/kfreebsd-amd64 b/build/arch-options/kfreebsd-amd64 index c9ff22ca6..9239f2a8e 100644 --- a/build/arch-options/kfreebsd-amd64 +++ b/build/arch-options/kfreebsd-amd64 @@ -6,6 +6,8 @@ archspec="kfreebsd-amd64;any-amd64;any-x86;not-x86;not-s390;not-powerpc" arch_listname="bsd" arch_porturl="kfreebsd-gnu" # This is coming from the lowmem package +minimum_memory_strict=170 +# This is coming from the lowmem package minimum_memory=232 # This is coming from the rootskel package, S60frontend minimum_memory_gtk=256 diff --git a/build/arch-options/kfreebsd-i386 b/build/arch-options/kfreebsd-i386 index 1eea6c41e..46be8b717 100644 --- a/build/arch-options/kfreebsd-i386 +++ b/build/arch-options/kfreebsd-i386 @@ -6,6 +6,8 @@ archspec="kfreebsd-i386;any-i386;any-x86;not-x86;not-s390;not-powerpc" arch_listname="bsd" arch_porturl="kfreebsd-gnu" # This is coming from the lowmem package +minimum_memory_strict=90 +# This is coming from the lowmem package minimum_memory=104 # This is coming from the rootskel package, S60frontend minimum_memory_gtk=256 diff --git a/build/arch-options/mips b/build/arch-options/mips index 16f9e7fb3..cee077d71 100644 --- a/build/arch-options/mips +++ b/build/arch-options/mips @@ -6,6 +6,8 @@ archspec="mips;not-x86;not-s390;not-powerpc" arch_listname="mips" arch_porturl="mips" # This is coming from the lowmem package +minimum_memory_strict=32 +# This is coming from the lowmem package minimum_memory=85 # These two options should be set if condition 'smp' is set below smp_config_section="Kernel type" diff --git a/build/arch-options/mips64el b/build/arch-options/mips64el index 145cbc393..2817c76a9 100644 --- a/build/arch-options/mips64el +++ b/build/arch-options/mips64el @@ -6,6 +6,8 @@ archspec="mips64el;not-x86;not-s390;not-powerpc" arch_listname="mips" arch_porturl="mips" # This is coming from the lowmem package +minimum_memory_strict=32 +# This is coming from the lowmem package minimum_memory=85 # These two options should be set if condition 'smp' is set below smp_config_section="Kernel type" diff --git a/build/arch-options/mipsel b/build/arch-options/mipsel index 81c8f0e53..ac4e22738 100644 --- a/build/arch-options/mipsel +++ b/build/arch-options/mipsel @@ -6,6 +6,8 @@ archspec="mipsel;not-x86;not-s390;not-powerpc" arch_listname="mips" arch_porturl="mips" # This is coming from the lowmem package +minimum_memory_strict=32 +# This is coming from the lowmem package minimum_memory=85 # These two options should be set if condition 'smp' is set below smp_config_section="Kernel type" diff --git a/build/arch-options/powerpc b/build/arch-options/powerpc index ead04a502..d885d54e2 100644 --- a/build/arch-options/powerpc +++ b/build/arch-options/powerpc @@ -7,6 +7,8 @@ arch_listname="powerpc" arch_porturl="powerpc" # TODO: update # This is coming from the lowmem package +minimum_memory_strict=32 +# This is coming from the lowmem package minimum_memory=64 # This is coming from the rootskel package, S60frontend minimum_memory_gtk=800 diff --git a/build/arch-options/ppc64el b/build/arch-options/ppc64el index f183e7b04..0b11af35d 100644 --- a/build/arch-options/ppc64el +++ b/build/arch-options/ppc64el @@ -7,6 +7,8 @@ arch_listname="powerpc" arch_porturl="powerpc" # TODO: update # This is coming from the lowmem package +minimum_memory_strict=32 +# This is coming from the lowmem package minimum_memory=64 # This is coming from the rootskel package, S60frontend minimum_memory_gtk=800 diff --git a/build/arch-options/s390 b/build/arch-options/s390 index 311048c90..b00794ce9 100644 --- a/build/arch-options/s390 +++ b/build/arch-options/s390 @@ -7,6 +7,8 @@ arch_listname="s390" arch_porturl="s390" # TODO: update # This is coming from the lowmem package +minimum_memory_strict=32 +# This is coming from the lowmem package minimum_memory=44 # These two options should be set if condition 'smp' is set below smp_config_section="Processor type and features" diff --git a/build/arch-options/s390x b/build/arch-options/s390x index d5a1fe665..76efbb3a7 100644 --- a/build/arch-options/s390x +++ b/build/arch-options/s390x @@ -11,6 +11,8 @@ arch_listname="s390" arch_porturl="s390" # TODO: update # This is coming from the lowmem package +minimum_memory_strict=32 +# This is coming from the lowmem package minimum_memory=44 # These two options should be set if condition 'smp' is set below smp_config_section="Processor type and features" diff --git a/build/arch-options/sparc b/build/arch-options/sparc index 83ad65f91..7bbcc5845 100644 --- a/build/arch-options/sparc +++ b/build/arch-options/sparc @@ -7,6 +7,8 @@ arch_listname="sparc" arch_porturl="sparc" # TODO: update # This is coming from the lowmem package +minimum_memory_strict=32 +# This is coming from the lowmem package minimum_memory=64 # These two options should be set if condition 'smp' is set below smp_config_section="General setup" diff --git a/build/buildone.sh b/build/buildone.sh index 3b8dc442c..7375838ff 100755 --- a/build/buildone.sh +++ b/build/buildone.sh @@ -96,6 +96,7 @@ create_profiled () { echo "<!ENTITY kernelpackage \"${kernelpackage}\">" >> $dynamic echo "<!ENTITY smp-config-section \"${smp_config_section}\">" >> $dynamic echo "<!ENTITY smp-config-option \"${smp_config_option}\">" >> $dynamic + echo "<!ENTITY minimum-memory-strict \"${minimum_memory_strict}¬ation-megabytes;\">" >> $dynamic echo "<!ENTITY minimum-memory \"${minimum_memory}¬ation-megabytes;\">" >> $dynamic echo "<!ENTITY minimum-memory-gtk \"${minimum_memory_gtk}¬ation-megabytes;\">" >> $dynamic diff --git a/build/buildone_ng.sh b/build/buildone_ng.sh index 3fb46f973..c251e132b 100755 --- a/build/buildone_ng.sh +++ b/build/buildone_ng.sh @@ -100,6 +100,7 @@ create_profiled () { echo "<!ENTITY kernelpackage \"${kernelpackage}\">" >> $dynamic echo "<!ENTITY smp-config-section \"${smp_config_section}\">" >> $dynamic echo "<!ENTITY smp-config-option \"${smp_config_option}\">" >> $dynamic + echo "<!ENTITY minimum-memory-strict \"${minimum_memory_strict}¬ation-megabytes;\">" >> $dynamic echo "<!ENTITY minimum-memory \"${minimum_memory}¬ation-megabytes;\">" >> $dynamic echo "<!ENTITY minimum-memory-gtk \"${minimum_memory_gtk}¬ation-megabytes;\">" >> $dynamic diff --git a/debian/changelog b/debian/changelog index 3b8e98008..2a9c0764b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,7 @@ installation-guide (20190324) UNRELEASED; urgency=medium [ Samuel Thibault ] * Update numbers. * Update dark theme shortcut. + * Update minimum memory figures. [ Updated translations ] * Greek by Emmanuel Galatoulas diff --git a/en/preparing/minimum-hardware-reqts.xml b/en/preparing/minimum-hardware-reqts.xml index 443481903..618561202 100644 --- a/en/preparing/minimum-hardware-reqts.xml +++ b/en/preparing/minimum-hardware-reqts.xml @@ -41,13 +41,13 @@ Any OldWorld or NewWorld PowerPC can serve well as a desktop system. <tbody> <row> <entry>No desktop</entry> - <entry>128 megabytes</entry> + <entry>256 megabytes</entry> <entry>512 megabytes</entry> <entry>2 gigabytes</entry> </row><row arch="not-s390"> <entry>With Desktop</entry> - <entry>256 megabytes</entry> - <entry>1 gigabyte</entry> + <entry>512 megabytes</entry> + <entry>2 gigabytes</entry> <entry>10 gigabytes</entry> </row> @@ -55,9 +55,13 @@ Any OldWorld or NewWorld PowerPC can serve well as a desktop system. <para> +The minimum value assumes that swap will be enabled. + +</para><para> + The actual minimum memory requirements are a lot less than the numbers -listed in this table. Depending on the architecture, it is possible to -install &debian; with as little as 60MB (for amd64). +listed in this table. With swap enabled, it is possible to +install &debian; with as little as &minimum-memory-strict;. The same goes for the disk space requirements, especially if you pick and choose which applications to install; see <xref linkend="tasksel-size-list"/> for additional information on disk |