Fix linux-xen log generation and update rootfile

diff --git a/config/rootfiles/packages/linux-xen b/config/rootfiles/packages/linux-xen
index 28e01dfbb8df2575f3869cbe18bee0f860361f9d..c7f3a766c0a5ea32a4a027f5728f4ca01980787d 100644 (file)
--- a/config/rootfiles/packages/linux-xen
+++ b/config/rootfiles/packages/linux-xen
@@ -3,6 +3,76 @@ boot/System.map-ipfire-xen
 boot/config-KVER-ipfire-xen
 boot/vmlinuz-KVER-ipfire-xen
 boot/vmlinuz-ipfire-xen
+#lib/firmware/atmsar11.fw
+#lib/firmware/cpia2
+#lib/firmware/cpia2/stv0672_vp4.bin
+#lib/firmware/dabusb
+#lib/firmware/dabusb/bitstream.bin
+#lib/firmware/dabusb/firmware.fw
+#lib/firmware/dsp56k
+#lib/firmware/dsp56k/bootstrap.bin
+#lib/firmware/edgeport
+#lib/firmware/edgeport/boot.fw
+#lib/firmware/edgeport/boot2.fw
+#lib/firmware/edgeport/down.fw
+#lib/firmware/edgeport/down2.fw
+#lib/firmware/edgeport/down3.bin
+#lib/firmware/emi26
+#lib/firmware/emi26/bitstream.fw
+#lib/firmware/emi26/firmware.fw
+#lib/firmware/emi26/loader.fw
+#lib/firmware/emi62
+#lib/firmware/emi62/bitstream.fw
+#lib/firmware/emi62/loader.fw
+#lib/firmware/emi62/midi.fw
+#lib/firmware/emi62/spdif.fw
+#lib/firmware/ess
+#lib/firmware/ess/maestro3_assp_kernel.fw
+#lib/firmware/ess/maestro3_assp_minisrc.fw
+#lib/firmware/intelliport2.bin
+#lib/firmware/kaweth
+#lib/firmware/kaweth/new_code.bin
+#lib/firmware/kaweth/new_code_fix.bin
+#lib/firmware/kaweth/trigger_code.bin
+#lib/firmware/kaweth/trigger_code_fix.bin
+#lib/firmware/keyspan
+#lib/firmware/keyspan/mpr.fw
+#lib/firmware/keyspan/usa18x.fw
+#lib/firmware/keyspan/usa19.fw
+#lib/firmware/keyspan/usa19qi.fw
+#lib/firmware/keyspan/usa19qw.fw
+#lib/firmware/keyspan/usa19w.fw
+#lib/firmware/keyspan/usa28.fw
+#lib/firmware/keyspan/usa28x.fw
+#lib/firmware/keyspan/usa28xa.fw
+#lib/firmware/keyspan/usa28xb.fw
+#lib/firmware/keyspan/usa49w.fw
+#lib/firmware/keyspan/usa49wlc.fw
+#lib/firmware/keyspan_pda
+#lib/firmware/keyspan_pda/keyspan_pda.fw
+#lib/firmware/keyspan_pda/xircom_pgs.fw
+#lib/firmware/korg
+#lib/firmware/korg/k1212.dsp
+#lib/firmware/sb16
+#lib/firmware/sb16/alaw_main.csp
+#lib/firmware/sb16/ima_adpcm_capture.csp
+#lib/firmware/sb16/ima_adpcm_init.csp
+#lib/firmware/sb16/ima_adpcm_playback.csp
+#lib/firmware/sb16/mulaw_main.csp
+#lib/firmware/ti_3410.fw
+#lib/firmware/ti_5052.fw
+#lib/firmware/tr_smctr.bin
+#lib/firmware/ttusb-budget
+#lib/firmware/ttusb-budget/dspbootcode.bin
+#lib/firmware/vicam
+#lib/firmware/vicam/firmware.fw
+#lib/firmware/whiteheat.fw
+#lib/firmware/whiteheat_loader.fw
+#lib/firmware/yamaha
+#lib/firmware/yamaha/ds1_ctrl.fw
+#lib/firmware/yamaha/ds1_dsp.fw
+#lib/firmware/yamaha/ds1e_ctrl.fw
+#lib/modules
 lib/modules/KVER-ipfire-xen
 #lib/modules/KVER-ipfire-xen/build
 #lib/modules/KVER-ipfire-xen/kernel

diff --git a/config/rootfiles/packages/x11libs b/config/rootfiles/packages/x11libs
index 9107edf9c1405958e6bdb83d4dc9db6d53674f1b..8b44f5e6bc76db9253f8941ffb64f3c9e719b5ca 100644 (file)
--- a/config/rootfiles/packages/x11libs
+++ b/config/rootfiles/packages/x11libs
@@ -1,5 +1,4 @@
 #doc
-#doc/libxcb-1.1
 #doc/libxcb-1.1/tutorial
 #doc/libxcb-1.1/tutorial/index.html
 #doc/libxcb-1.1/tutorial/xcb.css
@@ -2531,8 +2530,8 @@ usr/share/X11/locale
 #usr/share/man/man3/XtAppSetErrorHandler.3
 #usr/share/man/man3/XtAppSetErrorMsgHandler.3
 #usr/share/man/man3/XtAppSetExitFlag.3
-#man3/XtAppSetFallbackResources.3
-#man3/XtAppSetSelectionTimeout.3
+#usr/share/man/man3/XtAppSetFallbackResources.3
+#usr/share/man/man3/XtAppSetSelectionTimeout.3
 #usr/share/man/man3/XtAppSetTypeConverter.3
 #usr/share/man/man3/XtAppSetWarningHandler.3
 #usr/share/man/man3/XtAppSetWarningMsgHandler.3

diff --git a/lfs/Config b/lfs/Config
index 8e5c1e14ab14054a264d9da4427586f466c33b30..41cea22b5170cca459b68390a8290174f97653e9 100644 (file)
--- a/lfs/Config
+++ b/lfs/Config
@@ -88,12 +88,12 @@ define PREBUILD
        # Fix installation on partial rebuild, so modules install where they should
        # and not everytime on the last compiled kernel
        if [ -f $(DIR_SRC)/linux-$(KVER) ]; then \
-               if [ "$(SMP)" = "" ]; then \
+               if [ "$(XEN)" = "" ]; then \
                        cd $(DIR_SRC)/linux-$(KVER) && \
                                sed -i -e 's+^EXTRAVERSION.*$$+EXTRAVERSION\ =\ $(word 4,$(subst ., .,$(KVER)))-ipfire+' Makefile; \
                else \
                        cd $(DIR_SRC)/linux-$(KVER) && \
-                               sed -i -e 's+^EXTRAVERSION.*$$+EXTRAVERSION\ =\ $(word 4,$(subst ., .,$(KVER)))-ipfire-smp+' Makefile; \
+                               sed -i -e 's+^EXTRAVERSION.*$$+EXTRAVERSION\ =\ $(word 4,$(subst ., .,$(KVER)))-ipfire-xen+' Makefile; \
                fi; \
        fi
 endef
@@ -122,7 +122,7 @@ define POSTBUILD
        # $(TARGET)_rootfile : ROOTFILE with KVER replacement
        # $(TARGET) : log result with {commented|include|added} files
        if [ -s "$(TARGET)_diff" ]; then \
-               if [ "$(PASS)" = "SMP" ]; then LFS_SCRIPT=$(firstword $(MAKEFILE_LIST))-smp; \
+               if [ "$(XEN)" = "1" ]; then LFS_SCRIPT=$(firstword $(MAKEFILE_LIST))-xen; \
                else LFS_SCRIPT=$(firstword $(MAKEFILE_LIST)); \
                fi; \
                echo $(LFS_SCRIPT); \