Merge remote branch 'ms/arm-port' into arm-port

diff --git a/config/rootfiles/common/armv5tel/lm_sensors b/config/rootfiles/common/armv5tel/lm_sensors
new file mode 100644 (file)
index 0000000..774e47d
--- /dev/null
+++ b/config/rootfiles/common/armv5tel/lm_sensors
@@ -0,0 +1,23 @@
+etc/sensors.d
+etc/sensors3.conf
+usr/bin/sensors
+usr/bin/sensors-conf-convert
+#usr/include/sensors
+#usr/include/sensors/error.h
+#usr/include/sensors/sensors.h
+#usr/lib/libsensors.a
+usr/lib/libsensors.so
+usr/lib/libsensors.so.4
+usr/lib/libsensors.so.4.3.1
+#usr/man/man1/sensors.1
+#usr/man/man3/libsensors.3
+#usr/man/man5/sensors.conf.5
+#usr/man/man5/sensors3.conf.5
+#usr/man/man8/fancontrol.8
+#usr/man/man8/isadump.8
+#usr/man/man8/isaset.8
+#usr/man/man8/pwmconfig.8
+#usr/man/man8/sensors-detect.8
+usr/sbin/fancontrol
+usr/sbin/pwmconfig
+usr/sbin/sensors-detect

diff --git a/config/rootfiles/common/ncurses b/config/rootfiles/common/ncurses
index 953afad5446cd63cdf5211e2dc3907e9aecb10ea..ed892d6d00d8d03e4eba1794ebd9a8e6b8669cd8 100644 (file)
--- a/config/rootfiles/common/ncurses
+++ b/config/rootfiles/common/ncurses
@@ -2842,9 +2842,9 @@ usr/share/terminfo/v/vt100-w-am
 usr/share/terminfo/v/vt100-w-nam
 usr/share/terminfo/v/vt100-w-nav
 usr/share/terminfo/v/vt100nam
-#usr/share/terminfo/v/vt102
-#usr/share/terminfo/v/vt102-nsgr
-#usr/share/terminfo/v/vt102-w
+usr/share/terminfo/v/vt102
+usr/share/terminfo/v/vt102-nsgr
+usr/share/terminfo/v/vt102-w
 #usr/share/terminfo/v/vt125
 #usr/share/terminfo/v/vt131
 #usr/share/terminfo/v/vt132

diff --git a/lfs/as86 b/lfs/as86
index 0704a1a3fcc83b741bce584954ae750906f5a526..0acc340274ac32c289a9ae8c5af8f6935352b155 100644 (file)
--- a/lfs/as86
+++ b/lfs/as86
@@ -31,6 +31,7 @@ DL_FILE    = $(THISAPP).tar.gz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
+SUP_ARCH   = i586
 
 ###############################################################################
 # Top-level Rules

diff --git a/lfs/asterisk b/lfs/asterisk
index 6b8d4490390e27ff4db4a9291fd40d267e3c7f8d..e1a39773faf081d4de4289ec31a5b1f4f91979d4 100644 (file)
--- a/lfs/asterisk
+++ b/lfs/asterisk
@@ -31,6 +31,7 @@ DL_FILE    = $(THISAPP).tar.gz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
+SUP_ARCH   = i586
 PROG       = asterisk
 PAK_VER    = 5
 

diff --git a/lfs/cpufrequtils b/lfs/cpufrequtils
index eb3685761f5ace02f1d332db85214fcefed6eb33..e93a65d47d5a7692b20741430157a9f5f000b08a 100644 (file)
--- a/lfs/cpufrequtils
+++ b/lfs/cpufrequtils
@@ -31,6 +31,7 @@ DL_FILE    = $(THISAPP).tar.bz2
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
+SUP_ARCH   = i586
 PROG       = cpufrequtils
 PAK_VER    = 5
 

diff --git a/lfs/e1000 b/lfs/e1000
index 66e4fdd6e6c61020e2ae7aa3fc1e74ebf510c969..93a01a2b578c6b2902cdfef25af77614012207ed 100644 (file)
--- a/lfs/e1000
+++ b/lfs/e1000
@@ -41,6 +41,7 @@ DL_FILE    = $(THISAPP).tar.gz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)-kmod-$(KVER)-$(VERSUFIX)
+SUP_ARCH   = i586
 
 ###############################################################################
 # Top-level Rules

diff --git a/lfs/e1000e b/lfs/e1000e
index ba465952bda6d25478e919dc6d809a9b921a8aa2..274676131f69559820e72e7ec559d98ea1fd0c5f 100644 (file)
--- a/lfs/e1000e
+++ b/lfs/e1000e
@@ -41,6 +41,7 @@ DL_FILE    = $(THISAPP).tar.gz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)-kmod-$(KVER)-$(VERSUFIX)
+SUP_ARCH   = i586
 
 ###############################################################################
 # Top-level Rules

diff --git a/lfs/glibc b/lfs/glibc
index be3738206ec5c790534a7b4085c04a0604047617..5950b1c4e59f980d44c7fd3918fe0b917a7af63f 100644 (file)
--- a/lfs/glibc
+++ b/lfs/glibc
@@ -40,14 +40,14 @@ DIR_APP    = $(DIR_SRC)/$(THISAPP)
 ifeq "$(ROOT)" ""
   TARGET = $(DIR_INFO)/$(THISAPP)
   EXTRA_CONFIG = --prefix=/usr \
-    --disable-profile \
+    --disable-profile --enable-add-ons \
     --enable-kernel=2.6.0 --libexecdir=/usr/lib/glibc
   EXTRA_MAKE =
   EXTRA_INSTALL =
 else
   TARGET = $(DIR_INFO)/$(THISAPP)-tools
   EXTRA_CONFIG = --prefix=/tools \
-    --disable-profile \
+    --disable-profile --enable-add-ons \
     --enable-kernel=2.6.0 --with-binutils=/tools/bin \
     --without-gd --with-headers=/tools/include \
     --without-selinux
@@ -60,10 +60,7 @@ ifeq "$(MACHINE_TYPE)" "arm"
        EXTRA_CONFIG += \
                --build=arm \
                --host=$(BUILDTARGET) \
-               --without-fp \
-               --enable-add-ons=nptl,ports
-else
-       EXTRA_CONFIG += --enable-add-ons
+               --without-fp
 endif
 
 ###############################################################################

diff --git a/lfs/grub b/lfs/grub
index 6e5b6bf7b60e6a2802b13adf5e1233615978cc73..ad6e304aa61382257c0a6c786320410c80ec6635 100644 (file)
--- a/lfs/grub
+++ b/lfs/grub
@@ -31,6 +31,7 @@ DL_FILE    = $(THISAPP).tar.gz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
+SUP_ARCH   = i586
 CFLAGS     =
 CXXFLAGS   =
 

diff --git a/lfs/igb b/lfs/igb
index 678c7036708e06509e23f6b682dedd4e49c388e8..90d3d616ee893905aea5b89d4eb25e346e53fa19 100644 (file)
--- a/lfs/igb
+++ b/lfs/igb
@@ -41,6 +41,7 @@ DL_FILE    = $(THISAPP).tar.gz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)-kmod-$(KVER)-$(VERSUFIX)
+SUP_ARCH   = i586
 
 ###############################################################################
 # Top-level Rules

diff --git a/lfs/kqemu b/lfs/kqemu
index d07d9f1cc9771f06314bdc19e568b8ac5c7cd9cb..ebb148fa33e9d630094178d466c64545e23e52f8 100644 (file)
--- a/lfs/kqemu
+++ b/lfs/kqemu
@@ -41,6 +41,7 @@ DL_FILE    = $(THISAPP).tar.gz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)-kmod-$(KVER)-$(VERSUFIX)
+SUP_ARCH   = i586
 
 ###############################################################################
 # Top-level Rules

diff --git a/lfs/kvm-kmod b/lfs/kvm-kmod
index b6418acb17dbaae7ce905d04a82c59d6626a0054..94d9e844972605df1567207122008f7f287c3d53 100644 (file)
--- a/lfs/kvm-kmod
+++ b/lfs/kvm-kmod
@@ -41,6 +41,7 @@ DL_FILE    = $(THISAPP).tar.bz2
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)-kmod-$(KVER)-$(VERSUFIX)
+SUP_ARCH   = i586
 
 ###############################################################################
 # Top-level Rules

diff --git a/lfs/lcr b/lfs/lcr
index b743fddd9397c2de741502cd1cc19d279d012d4e..8b4e04b740f4bc99f24b97e591e6977144421797 100644 (file)
--- a/lfs/lcr
+++ b/lfs/lcr
@@ -31,6 +31,7 @@ DL_FILE    = $(THISAPP).tar.gz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
+SUP_ARCH   = i586
 PROG       = lcr
 PAK_VER    = 3
 

diff --git a/lfs/mISDN b/lfs/mISDN
index 8eec207819a077c801b469c78ce83cc2d1837535..7ea0c67a1bc5026c198c86ea0d8ea46f241d5ffd 100644 (file)
--- a/lfs/mISDN
+++ b/lfs/mISDN
@@ -41,6 +41,7 @@ DL_FILE    = $(THISAPP).tar.gz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)-kmod-$(KVER)-$(VERSUFIX)
+SUP_ARCH   = i586
 
 ###############################################################################
 # Top-level Rules

diff --git a/lfs/madwifi b/lfs/madwifi
index 90f1a1c67ed7a0d8233633db864ccaeb2d7a212a..fb44be98ba9658df755342e6c308259b9389eadf 100644 (file)
--- a/lfs/madwifi
+++ b/lfs/madwifi
@@ -42,6 +42,7 @@ DL_FILE    = $(THISAPP).tar.gz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)-kmod-$(KVER)-$(VERSUFIX)
+SUP_ARCH   = i586
 
 ###############################################################################
 # Top-level Rules

diff --git a/lfs/mbr b/lfs/mbr
index 32db20384a159de80561e4fb8cfa39dc5b52ec99..077efa7b754b1f3907e8c43c801bb2ecd5b28a49 100644 (file)
--- a/lfs/mbr
+++ b/lfs/mbr
@@ -31,6 +31,7 @@ DL_FILE    = $(THISAPP).tar.gz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
+SUP_ARCH   = i586
 
 ###############################################################################
 # Top-level Rules

diff --git a/lfs/memtest b/lfs/memtest
index a6179ed362de9b4518e152d7c2a864daf93d424c..4914baed54cf47d8b86c2c693a592830a3fa7d9a 100644 (file)
--- a/lfs/memtest
+++ b/lfs/memtest
@@ -31,6 +31,7 @@ DL_FILE    = $(THISAPP).tar.gz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
+SUP_ARCH   = i586
 
 ###############################################################################
 # Top-level Rules

diff --git a/lfs/openvmtools b/lfs/openvmtools
index a34e031b411de4f23b5a6f904266fb20bab5101d..d8a7c482b09eacd7875ed715c83ad2f0ecc01118 100644 (file)
--- a/lfs/openvmtools
+++ b/lfs/openvmtools
@@ -31,6 +31,7 @@ DL_FILE    = $(THISAPP).tar.gz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
+SUP_ARCH   = i586
 PROG       = openvmtools
 PAK_VER    = 1
 DEPS       = "glib"

diff --git a/lfs/qemu b/lfs/qemu
index 03c20d5544724f2e5e3763873db9411b070b45f9..049efff3eaf9b87b6847ec62c5de96489412c41e 100644 (file)
--- a/lfs/qemu
+++ b/lfs/qemu
@@ -31,6 +31,7 @@ DL_FILE    = $(THISAPP).tar.gz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
+SUP_ARCH   = i586
 PROG       = qemu
 PAK_VER    = 11
 

diff --git a/lfs/qemu-kqemu b/lfs/qemu-kqemu
index 38dc6a7da192628d89cc45a59bec071f66b8af33..c2b6b3369638197f2a773d8edd503de6b8c70524 100644 (file)
--- a/lfs/qemu-kqemu
+++ b/lfs/qemu-kqemu
@@ -31,6 +31,7 @@ DL_FILE    = $(THISAPP).tar.gz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)-kqemu
+SUP_ARCH   = i586
 PROG       = qemu-kqemu
 PAK_VER    = 3
 

diff --git a/lfs/syslinux b/lfs/syslinux
index bf682289bdedf72a2d4578730182df596738f8f1..ba739ea752610d50658fca90e1ccf2834318703d 100644 (file)
--- a/lfs/syslinux
+++ b/lfs/syslinux
@@ -31,6 +31,7 @@ DL_FILE    = $(THISAPP).tar.bz2
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
+SUP_ARCH   = i586
 
 ###############################################################################
 # Top-level Rules

diff --git a/lfs/vdr b/lfs/vdr
index 28e34cc0ec011c50cf6152702a0d8e310c6c7db6..e98d845f45141f4818a5187140b14ca8157e8cff 100644 (file)
--- a/lfs/vdr
+++ b/lfs/vdr
@@ -35,6 +35,7 @@ DL_FILE4   = vdr-epgsearch-0.9.24.tgz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
+SUP_ARCH   = i586
 PROG       = vdr
 PAK_VER    = 5
 

diff --git a/make.sh b/make.sh
index 477cd93ca5092560583c3063d7cf8a2c2a6af942..28a4724d795f76734faeb67d2a07f670aa0e0fb0 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -352,11 +352,7 @@ buildbase() {
     lfsmake2 udev
     lfsmake2 util-linux
     lfsmake2 vim
-
-    # ARM cannot use grub.
-    if [ "${MACHINE_TYPE}" != "arm" ]; then
-      lfsmake2 grub
-    fi
+    lfsmake2 grub
 }
 
 buildipfire() {
@@ -417,27 +413,24 @@ buildipfire() {
   # Default kernel build
   ipfiremake linux
   ipfiremake v4l-dvb
-
-  if [ "${MACHINE_TYPE}" != "arm" ]; then
-    # Virtualization helpers are only available for x86.
-    ipfiremake kqemu
-    ipfiremake kvm-kmod
-    #unsupported arch (armv5)
-    ipfiremake madwifi
+  ipfiremake kqemu
+  ipfiremake kvm-kmod
+  ipfiremake madwifi
+  if [ "${MACHINE_TYPE}" = "arm" ]; then
     #todo enable alsa driver in kernel config
     ipfiremake alsa                    KMOD=1
-    #undefined declaration in echo canceler try to fix later
-    ipfiremake mISDN
   fi
+  #undefined declaration in echo canceler try to fix later
+  ipfiremake mISDN
   ipfiremake dahdi                     KMOD=1
   ipfiremake cryptodev
   ipfiremake compat-wireless
 #  ipfiremake r8169
 #  ipfiremake r8168
 #  ipfiremake r8101
-  #ipfiremake e1000
-  #ipfiremake e1000e
-  #ipfiremake igb
+  ipfiremake e1000
+  ipfiremake e1000e
+  ipfiremake igb
   ipfiremake pkg-config
   ipfiremake linux-atm
   ipfiremake cpio
@@ -638,8 +631,8 @@ buildipfire() {
   ipfiremake igmpproxy
   ipfiremake fbset
   ipfiremake sdl
-  #ipfiremake qemu
-  #ipfiremake qemu-kqemu
+  ipfiremake qemu
+  ipfiremake qemu-kqemu
   ipfiremake sane
   ipfiremake netpbm
   ipfiremake phpSANE
@@ -654,7 +647,7 @@ buildipfire() {
   ipfiremake faad2
   ipfiremake ffmpeg
   ipfiremake videolan
-  #ipfiremake vdr
+  ipfiremake vdr
   ipfiremake w_scan
   ipfiremake icecast
   ipfiremake icegenerator
@@ -670,11 +663,9 @@ buildipfire() {
   ipfiremake wpa_supplicant
   ipfiremake hostapd
   ipfiremake urlgrabber
-  if [ "${MACHINE_TYPE}" != "arm" ]; then
-    ipfiremake syslinux
-  fi
+  ipfiremake syslinux
   ipfiremake tftpd
-  #ipfiremake cpufrequtils
+  ipfiremake cpufrequtils
   ipfiremake dbus
   ipfiremake bluetooth
   ipfiremake gutenprint
@@ -697,9 +688,7 @@ buildipfire() {
   ipfiremake perl-DBD-mysql
   ipfiremake cacti
   ipfiremake icecc
-  if [ "${MACHINE_TYPE}" != "arm" ]; then
-    ipfiremake openvmtools
-  fi
+  ipfiremake openvmtools
   ipfiremake nagiosql
   ipfiremake iftop
   ipfiremake motion
@@ -708,8 +697,8 @@ buildipfire() {
   ipfiremake watchdog
   ipfiremake libpri
   ipfiremake dahdi
-  #ipfiremake asterisk
-  #ipfiremake lcr
+  ipfiremake asterisk
+  ipfiremake lcr
   ipfiremake usb_modeswitch
   ipfiremake usb_modeswitch_data
   ipfiremake zerofree
@@ -755,11 +744,9 @@ buildinstaller() {
   # Run installer scripts one by one
   LOGFILE="$BASEDIR/log/_build.installer.log"
   export LOGFILE
-  if [ "${MACHINE_TYPE}" != "arm" ]; then
-    ipfiremake as86
-    ipfiremake mbr
-    ipfiremake memtest
-  fi
+  ipfiremake as86
+  ipfiremake mbr
+  ipfiremake memtest
   ipfiremake installer
   cp -f $BASEDIR/doc/COPYING $BASEDIR/build/install/initrd/
   installmake strip
@@ -952,7 +939,8 @@ downloadsrc)
                cd $BASEDIR/lfs
                for i in *; do
                        if [ -f "$i" -a "$i" != "Config" ]; then
-                               echo -ne "Loading $i"
+                               lfsmakecommoncheck ${i} || continue
+
                                make -s -f $i LFS_BASEDIR=$BASEDIR MACHINE=$MACHINE \
                                        MESSAGE="$i\t ($c/$MAX_RETRIES)" download >> $LOGFILE 2>&1
                                if [ $? -ne 0 ]; then

diff --git a/tools/make-functions b/tools/make-functions
index e556994f1bece5f612f5409a842753545d08560a..e6333a3838b3675401b0177f6242b0cbe465aa07 100644 (file)
--- a/tools/make-functions
+++ b/tools/make-functions
@@ -185,7 +185,6 @@ beautify()
                                        echo -ne "${SET_RESULT_COL}[${FAIL} FAIL ${NORMAL}]\n"
                                        ;;
                                SKIP)
-                                       echo -ne "${SET_TIME_COL}[ ${BOLD}${SET_TIME_COL_REAL}$PKG_TIME${NORMAL} ]"
                                        echo -ne "${SET_RESULT_COL}[${SKIP} SKIP ${NORMAL}]\n"
                                        ;;
                        esac
@@ -318,6 +317,16 @@ lfsmakecommoncheck()
        local PKG_VER=`get_pkg_ver $BASEDIR/lfs/$1`
        beautify make_pkg "$PKG_VER $*"
 
+       # Check if this package is supported by our architecture.
+       # If no SUP_ARCH is found, we assume the package can be built for all.
+       if grep "^SUP_ARCH" ${BASEDIR}/lfs/${1} >/dev/null; then
+               # Check if package supports ${MACHINE} or all architectures.
+               if ! grep -E "^SUP_ARCH.*${MACHINE}|^SUP_ARCH.*all" ${BASEDIR}/lfs/${1} >/dev/null; then
+                       beautify result SKIP
+                       return 1
+               fi
+       fi
+
        # Script slipped?
        local i
        for i in $SKIP_PACKAGE_LIST