Changeset c7ec163

Timestamp:

Mar 7, 2006, 3:28:28 AM (19 years ago)

Author:

Jim Gifford <clfs@…>

Branches:

clfs-1.2, clfs-2.1, clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit

Children:

8546c13

Parents:

80dc21b

Message:

r2473@server (orig r1230): ryan | 2006-03-06 23:56:13 -0800

r1232@rei: lfs | 2006-03-07 18:03:13 +1100
Gah, push in long forgotten changes (must sync more often)

Location:

scripts

Files:

• configs/kernel/linux-2.6.15-x86_64.config-K8VNXP (added)
• patches/glibc-20051107-libgcc_eh-1.patch (added)
• patches/glibc-20051107-localedef_segfault-1.patch (added)
• patches/shadow-4.0.14-configure_fix-1.patch (added)
• scripts/native-scripts/native-shadow.sh (modified) (1 diff)
• scripts/native-scripts/temp-tcl.sh (modified) (1 diff)
• scripts/plfs-configs/plfs-config-x86_64-native (modified) (1 diff)
• scripts/plfs-configs/plfs-packages-20060112 (modified) (3 diffs)
• scripts/plfs-packages (modified) (1 diff)
• scripts/target-scripts/target-coreutils.sh (modified) (1 diff)
• scripts/target-scripts/target-flex.sh (modified) (1 diff)
• scripts/target-scripts/target-kernel.sh (modified) (1 diff)

scripts/scripts/native-scripts/native-shadow.sh

@@ -32 +32 @@
    libmisc/xmalloc.c-ORIG > libmisc/xmalloc.c
 
-# fix lastlog for shadow-4.0.7
 case ${SHADOW_VER} in
    4.0.7 )
+      # fix lastlog for shadow-4.0.7
       apply_patch shadow-4.0.7-fix_lastlog-1
+   ;;
+   4.0.14 )
+      apply_patch shadow-4.0.14-configure_fix-1
    ;;
 esac

scripts/scripts/native-scripts/temp-tcl.sh

@@ -57 +57 @@
 make install \
    >> ${LOGFILE} 2>&1 &&
-echo " o ALL OK" || barf
+echo " o Install OK" || barf
+
+# Following for ~tcl 8.4.12
+case ${TCL_VER} in
+   8.4.1[2-9]* )
+      make install-private-headers \
+         >>  ${LOGFILE} 2>&1 &&
+      echo " o install-private-headers OK" || barf
+   ;;
+esac
 
 # Create symlink for tclsh

scripts/scripts/plfs-configs/plfs-config-x86_64-native

@@ -34 +34 @@
 export SRC=/home/lfs/src/x86_64
 export TARBALLS=/mnt/tarballs
-export PATCHES=/home/lfs/cross-lfs/patches
-export SCRIPTS=/home/lfs/cross-lfs/scripts
-export CONFIGS=/home/lfs/cross-lfs/configs
+export PATCHES=/home/lfs/cross-lfs-scripts/patches
+export SCRIPTS=/home/lfs/cross-lfs-scripts/scripts
+export CONFIGS=/home/lfs/cross-lfs-scripts/configs
 
 # Logging

scripts/scripts/plfs-configs/plfs-packages-20060112

@@ -34 +34 @@
 export FLEX_VER=2.5.31
 export GAWK_VER=3.1.5
-export GCC_VER=4.0.2
+export GCC_VER=4.1.0-svn-20060112
 export GETTEXT_VER=0.14.5
-export GLIBC_VER=2.3.5
+export GLIBC_VER=2.3.90-20060112
 export GREP_VER=2.5.1a
 export GROFF_VER=1.19.2                 # chapter 6
@@ -72 +72 @@
 export READLINE_VER=5.0
 export SED_VER=4.1.4
-export SHADOW_VER=4.0.13                # chapter 6
+export SHADOW_VER=4.0.14                # chapter 6
 #export STRACE_VER=4.5.11
 export SYSKLOGD_VER=1.4.1               # chapter 6
@@ -78 +78 @@
 export TAR_VER=1.15.1
 export TCPWRAP_VER=7.6
-export TCL_VER=8.4.11
+export TCL_VER=8.4.12
 export TEXINFO_VER=4.8
 export UDEV_VER=080

scripts/scripts/plfs-packages

@@ -1 @@
-plfs-configs/plfs-packages-20050515
+plfs-configs/plfs-packages-20060112

scripts/scripts/target-scripts/target-coreutils.sh

@@ -68 +68 @@
 
 min_log_init ${BUILDLOGS} &&
-make ${PMFLAGS} LDFLAGS="-s" \
+make LDFLAGS="-s" \
    >> ${LOGFILE} 2>&1 &&
 echo " o Build OK" &&

scripts/scripts/target-scripts/target-flex.sh

@@ -53 +53 @@
 min_log_init ${BUILDLOGS} &&
 #make ${PMFLAGS} LDFLAGS="-s" \
-make ${PMFLAGS} LDFLAGS="-s" \
+make LDFLAGS="-s" \
    >> ${LOGFILE} 2>&1 &&
 echo " o Build OK" &&

scripts/scripts/target-scripts/target-kernel.sh

@@ -63 +63 @@
 
       # fix issues with kernel concerning 2.16 binutils
-      # checked against 2.6.11, need to check against 2.6.12
-      case ${target_gas_ver} in
-         2.16* ) apply_patch linux-2.6-seg-5 ;;
+      # checked against 2.6.11, need to check against 2.6.12 and earlier
+      # Patch does not apply to 2.6.15
+      case ${KERNEL_VER} in
+         2.6.1[01]* )
+            case ${target_gas_ver} in
+               2.16* ) apply_patch linux-2.6-seg-5 ;;
+            esac
+         ;;
       esac