SVN: bootdisk/trunk: Makefile.am batch-installer/installer-functions batch-installer/installer-pkgs ...
hawk
hawk at pld-linux.org
Sat Apr 7 15:05:47 CEST 2007
Author: hawk
Date: Sat Apr 7 15:05:45 2007
New Revision: 8445
Modified:
bootdisk/trunk/Makefile.am
bootdisk/trunk/batch-installer/installer-functions
bootdisk/trunk/batch-installer/installer-pkgs
bootdisk/trunk/batch-installer/installer-prep
bootdisk/trunk/batch-installer/ui/ui-main
bootdisk/trunk/batch-installer/ui/ui-parted2
bootdisk/trunk/mod/mkmod
Log:
- get rid of obsolete KERNEL_VERCODE
- cosmetics
Modified: bootdisk/trunk/Makefile.am
==============================================================================
--- bootdisk/trunk/Makefile.am (original)
+++ bootdisk/trunk/Makefile.am Sat Apr 7 15:05:45 2007
@@ -4,11 +4,6 @@
INSTALLER_DIR := /PLD/inst/2.4.34
KERNEL_VER := 2.4.34-1BOOT
FTP_DIST_DIR := /dists/2.0/PLD
-# as for now:
-# 2 - 2.2.*
-# 4 - 2.4.*
-# this is used to detect whether to build ext3 etc stuff
-KERNEL_VERCODE := 4
# end of configurable parameters
ARCH := $(shell uname -m | sed -e 's/i.86/ia32/; s/athlon/ia32/')
@@ -130,7 +125,6 @@
installer-rc: force
( echo 'INSTALLER_DIR="$(INSTALLER_DIR)"' ; \
echo 'KERNEL_VER="$(KERNEL_VER)"' ; \
- echo 'KERNEL_VERCODE="$(KERNEL_VERCODE)"' ; \
echo 'FTP_DIST_DIR="$(FTP_DIST_DIR)"' ) > installer-rc
.PHONY: force
Modified: bootdisk/trunk/batch-installer/installer-functions
==============================================================================
--- bootdisk/trunk/batch-installer/installer-functions (original)
+++ bootdisk/trunk/batch-installer/installer-functions Sat Apr 7 15:05:45 2007
@@ -77,9 +77,8 @@
load_installer_rc () {
# defaults, should be overridden
INSTALLER_DIR="/inst/pkg"
- KERNEL_VER="2.2.20"
- KERNEL_VERCODE="2"
- FTP_DIST_DIR="/dists/ra/PLD"
+ KERNEL_VER="2.4.34"
+ FTP_DIST_DIR="/dists/ac/PLD"
if test -r /etc/installer-rc ; then
. /etc/installer-rc
Modified: bootdisk/trunk/batch-installer/installer-pkgs
==============================================================================
--- bootdisk/trunk/batch-installer/installer-pkgs (original)
+++ bootdisk/trunk/batch-installer/installer-pkgs Sat Apr 7 15:05:45 2007
@@ -177,19 +177,6 @@
poldek)
load_package poldek
- # nasty workaround for grow_inode: allocation failed on low-memory
- # systems, with 2.2 kernels.
- if [ $KERNEL_VERCODE -lt 4 ] ; then
- log info "Enabling workaround for 'grow_inodes: allocation failed'"
- count=1
- mkdir /dest/installer/tmp/workaround
- while test $count -le 2000; do
- count=$(($count+1))
- mknod /dest/installer/tmp/workaround/$count c 1 3 || break
- done
- rm -fr /dest/installer/tmp/workaround
- fi
-
export TMPDIR=/installer/tmp
poldek_log=/dest/installer/poldek.log
echo -n > $poldek_log
Modified: bootdisk/trunk/batch-installer/installer-prep
==============================================================================
--- bootdisk/trunk/batch-installer/installer-prep (original)
+++ bootdisk/trunk/batch-installer/installer-prep Sat Apr 7 15:05:45 2007
@@ -690,9 +690,6 @@
fi
;;
ext3)
- if [ $KERNEL_VERCODE -lt 4 ] ; then
- die "ext3 unsupported for 2.2.x kernels. sorry"
- fi
if test -z "$have_ext3"; then
load_package ext2
load_package ext3-mod
@@ -701,9 +698,6 @@
fi
;;
xfs)
- if [ $KERNEL_VERCODE -lt 4 ] ; then
- die "xfs unsupported for 2.2.x kernels. sorry"
- fi
if test -z "$have_xfs"; then
load_package xfs
load_package xfs-mod
Modified: bootdisk/trunk/batch-installer/ui/ui-main
==============================================================================
--- bootdisk/trunk/batch-installer/ui/ui-main (original)
+++ bootdisk/trunk/batch-installer/ui/ui-main Sat Apr 7 15:05:45 2007
@@ -568,10 +568,8 @@
<item id="$item2">$item2: `nls "Reiser FS filesystem"`
<item id="$item3">$item3: `nls "Partition to build RAID from"`
<item id="$item4">$item4: `nls "IBM Journaling Filesystem"`
- $(if [ $KERNEL_VERCODE -ge 4 ] ; then
- echo "<item id="$item5">$item5: `nls "Journaling version of ext2"`"
- echo "<item id="$item6">$item6: `nls "SGI Journaling Filesystem"`"
- fi)
+ <item id="$item5">$item5: `nls "Journaling version of ext2"`
+ <item id="$item6">$item6: `nls "SGI Journaling Filesystem"`
</menu>
$@
EOF
Modified: bootdisk/trunk/batch-installer/ui/ui-parted2
==============================================================================
--- bootdisk/trunk/batch-installer/ui/ui-parted2 (original)
+++ bootdisk/trunk/batch-installer/ui/ui-parted2 Sat Apr 7 15:05:45 2007
@@ -552,15 +552,6 @@
}
filesystems_menu () {
- if [ $KERNEL_VERCODE -ge 4 ] ; then
- xfs="<item id=xfs>$(nls "xfs: _Journaling FS from SGI")
-"
- ext3="<item id=ext3>$(nls "ext_3 (ext2 + Journaling)")
-"
- else
- xfs=
- ext3=
- fi
echo -n '<menu id=fs '
@@ -575,11 +566,13 @@
cat <<EOF
<item id=ext2>$(nls "_Second _Extended (ext2)")
-<item id=swap>$(nls _Swapspace)
+<item id=ext3>$(nls "ext_3 (ext2 + Journaling)")
<item id=reiserfs>$(nls "_Reiser FS")
+<item id=jfs>$(nls "jfs: _Journaling FS from IBM")
+<item id=xfs>$(nls "xfs: _Journaling FS from SGI")
+<item id=swap>$(nls _Swapspace)
<item id=md>$(nls "_RAID building partition")
-$xfs<item id=jfs>$(nls "jfs: _Journaling FS from IBM")
-$ext3</menu>
+</menu>
EOF
}
Modified: bootdisk/trunk/mod/mkmod
==============================================================================
--- bootdisk/trunk/mod/mkmod (original)
+++ bootdisk/trunk/mod/mkmod Sat Apr 7 15:05:45 2007
@@ -109,14 +109,13 @@
mod=
mod_list=
fake_list=
- if [ "$(echo $cmd | grep mod4 || :)" = "" \
- -o "$KERNEL_VERCODE" -ge 4 ] ; then
+ if [ "$(echo $cmd | grep mod4 || :)" = "" ] ; then
mod="$rest"
fi
might_be_empty=$(echo $cmd | grep empty || :)
;;
@fake | @fake4)
- if [ "$cmd" = @fake -o "$KERNEL_VERCODE" -ge 4 ] ; then
+ if [ "$cmd" = @fake ] ; then
fake_list="$fake_list $rest"
fi
;;
More information about the pld-cvs-commit
mailing list