Merge branch 'testing' of ssh://jams@linhes.org/mount/repository/linhes_dev into testing

8 files changed, 363 insertions, 6 deletions

diff --git a/build_tools/larch8/larch0/profiles/linhes-local-disk-testing-i686/addedpacks b/build_tools/larch8/larch0/profiles/linhes-local-disk-testing-i686/addedpacks
index 21c6359..7c1f75e 100755
--- a/build_tools/larch8/larch0/profiles/linhes-local-disk-testing-i686/addedpacks
+++ b/build_tools/larch8/larch0/profiles/linhes-local-disk-testing-i686/addedpacks
@@ -142,9 +142,8 @@ pkgconfig
 taglib
 #portmap
 ivtv-utils
-#disabled due to conflicts with linux-firmware
 
-#dvb-firmware
+dvb-firmware
 dbus-python
 
 #MythVantage Installer deps
diff --git a/build_tools/larch8/larch0/profiles/linhes-local-disk-testing-i686/rootoverlay/etc/mkinitcpio.conf.larch0 b/build_tools/larch8/larch0/profiles/linhes-local-disk-testing-i686/rootoverlay/etc/mkinitcpio.conf.larch0
new file mode 100644
index 0000000..b500db2
--- /dev/null
+++ b/build_tools/larch8/larch0/profiles/linhes-local-disk-testing-i686/rootoverlay/etc/mkinitcpio.conf.larch0
@@ -0,0 +1,72 @@
+# vim:set ft=sh
+# MODULES
+# The following modules are loaded before any boot hooks are
+# run.  Advanced users may wish to specify all system modules
+# in this array.  For instance:
+#     MODULES="piix ide_disk reiserfs"
+MODULES="nfs"
+
+# BINARIES
+# This setting includes any additional binaries a given user may
+# wish into the CPIO image.  This is run first, so it may be used to
+# override the actual binaries used in a given hook.
+# (Existing files are NOT overwritten if already added)
+# BINARIES are dependency parsed, so you may safely ignore libraries
+BINARIES=""
+
+# FILES
+# This setting is similar to BINARIES above, however, files are added
+# as-is and are not parsed in any way.  This is useful for config files.
+# Some users may wish to include modprobe.conf for custom module options
+# like so:
+#    FILES="/etc/modprobe.d/modprobe.conf"
+FILES=""
+
+# HOOKS
+# This is the most important setting in this file.  The HOOKS control the
+# modules and scripts added to the image, and what happens at boot time.
+# Order is important, and it is recommended that you do not change the
+# order in which HOOKS are added.  Run 'mkinitcpio -H <hook name>' for
+# help on a given hook.
+# 'base' is _required_ unless you know precisely what you are doing.
+# 'udev' is _required_ in order to automatically load modules
+# 'filesystems' is _required_ unless you specify your fs modules in MODULES
+# Examples:
+##   This setup specifies all modules in the MODULES setting above.
+##   No raid, lvm2, or encrypted root is needed.
+#    HOOKS="base"
+#
+##   This setup will autodetect all modules for your system and should
+##   work as a sane default
+#    HOOKS="base udev autodetect pata scsi sata filesystems"
+#
+##   This is identical to the above, except the old ide subsystem is
+##   used for IDE devices instead of the new pata subsystem.
+#    HOOKS="base udev autodetect ide scsi sata filesystems"
+#
+##   This setup will generate a 'full' image which supports most systems.
+##   No autodetection is done.
+#    HOOKS="base udev pata scsi sata usb filesystems"
+#
+##   This setup assembles a pata mdadm array with an encrypted root FS.
+##   Note: See 'mkinitcpio -H mdadm' for more information on raid devices.
+#    HOOKS="base udev pata mdadm encrypt filesystems"
+#
+##   This setup loads an lvm2 volume group on a usb device.
+#    HOOKS="base udev usb lvm2 filesystems"
+HOOKS="base udev usb net autodetect pata scsi sata filesystems usbinput fbsplash larch"
+
+# COMPRESSION
+# Use this to compress the initramfs image. With kernels earlier than
+# 2.6.30, only gzip is supported, which is also the default. Newer kernels
+# support gzip, bzip2 and lzma. Kernels 2.6.38 and later support xz
+# compression.
+#COMPRESSION="gzip"
+#COMPRESSION="bzip2"
+COMPRESSION="lzma"
+#COMPRESSION="xz"
+#COMPRESSION="lzop"
+
+# COMPRESSION_OPTIONS
+# Additional options for the compressor
+#COMPRESSION_OPTIONS=""
diff --git a/build_tools/larch8/larch0/profiles/linhes-local-mirror-stable-i686/rootoverlay/etc/mkinitcpio.conf.larch0 b/build_tools/larch8/larch0/profiles/linhes-local-mirror-stable-i686/rootoverlay/etc/mkinitcpio.conf.larch0
new file mode 100644
index 0000000..b500db2
--- /dev/null
+++ b/build_tools/larch8/larch0/profiles/linhes-local-mirror-stable-i686/rootoverlay/etc/mkinitcpio.conf.larch0
@@ -0,0 +1,72 @@
+# vim:set ft=sh
+# MODULES
+# The following modules are loaded before any boot hooks are
+# run.  Advanced users may wish to specify all system modules
+# in this array.  For instance:
+#     MODULES="piix ide_disk reiserfs"
+MODULES="nfs"
+
+# BINARIES
+# This setting includes any additional binaries a given user may
+# wish into the CPIO image.  This is run first, so it may be used to
+# override the actual binaries used in a given hook.
+# (Existing files are NOT overwritten if already added)
+# BINARIES are dependency parsed, so you may safely ignore libraries
+BINARIES=""
+
+# FILES
+# This setting is similar to BINARIES above, however, files are added
+# as-is and are not parsed in any way.  This is useful for config files.
+# Some users may wish to include modprobe.conf for custom module options
+# like so:
+#    FILES="/etc/modprobe.d/modprobe.conf"
+FILES=""
+
+# HOOKS
+# This is the most important setting in this file.  The HOOKS control the
+# modules and scripts added to the image, and what happens at boot time.
+# Order is important, and it is recommended that you do not change the
+# order in which HOOKS are added.  Run 'mkinitcpio -H <hook name>' for
+# help on a given hook.
+# 'base' is _required_ unless you know precisely what you are doing.
+# 'udev' is _required_ in order to automatically load modules
+# 'filesystems' is _required_ unless you specify your fs modules in MODULES
+# Examples:
+##   This setup specifies all modules in the MODULES setting above.
+##   No raid, lvm2, or encrypted root is needed.
+#    HOOKS="base"
+#
+##   This setup will autodetect all modules for your system and should
+##   work as a sane default
+#    HOOKS="base udev autodetect pata scsi sata filesystems"
+#
+##   This is identical to the above, except the old ide subsystem is
+##   used for IDE devices instead of the new pata subsystem.
+#    HOOKS="base udev autodetect ide scsi sata filesystems"
+#
+##   This setup will generate a 'full' image which supports most systems.
+##   No autodetection is done.
+#    HOOKS="base udev pata scsi sata usb filesystems"
+#
+##   This setup assembles a pata mdadm array with an encrypted root FS.
+##   Note: See 'mkinitcpio -H mdadm' for more information on raid devices.
+#    HOOKS="base udev pata mdadm encrypt filesystems"
+#
+##   This setup loads an lvm2 volume group on a usb device.
+#    HOOKS="base udev usb lvm2 filesystems"
+HOOKS="base udev usb net autodetect pata scsi sata filesystems usbinput fbsplash larch"
+
+# COMPRESSION
+# Use this to compress the initramfs image. With kernels earlier than
+# 2.6.30, only gzip is supported, which is also the default. Newer kernels
+# support gzip, bzip2 and lzma. Kernels 2.6.38 and later support xz
+# compression.
+#COMPRESSION="gzip"
+#COMPRESSION="bzip2"
+COMPRESSION="lzma"
+#COMPRESSION="xz"
+#COMPRESSION="lzop"
+
+# COMPRESSION_OPTIONS
+# Additional options for the compressor
+#COMPRESSION_OPTIONS=""
diff --git a/build_tools/larch8/larch0/profiles/linhes-local-mirror-testing-i686/addedpacks b/build_tools/larch8/larch0/profiles/linhes-local-mirror-testing-i686/addedpacks
index 21c6359..7c1f75e 100755
--- a/build_tools/larch8/larch0/profiles/linhes-local-mirror-testing-i686/addedpacks
+++ b/build_tools/larch8/larch0/profiles/linhes-local-mirror-testing-i686/addedpacks
@@ -142,9 +142,8 @@ pkgconfig
 taglib
 #portmap
 ivtv-utils
-#disabled due to conflicts with linux-firmware
 
-#dvb-firmware
+dvb-firmware
 dbus-python
 
 #MythVantage Installer deps
diff --git a/build_tools/larch8/larch0/profiles/linhes-local-mirror-testing-i686/rootoverlay/etc/mkinitcpio.conf.larch0 b/build_tools/larch8/larch0/profiles/linhes-local-mirror-testing-i686/rootoverlay/etc/mkinitcpio.conf.larch0
new file mode 100644
index 0000000..b500db2
--- /dev/null
+++ b/build_tools/larch8/larch0/profiles/linhes-local-mirror-testing-i686/rootoverlay/etc/mkinitcpio.conf.larch0
@@ -0,0 +1,72 @@
+# vim:set ft=sh
+# MODULES
+# The following modules are loaded before any boot hooks are
+# run.  Advanced users may wish to specify all system modules
+# in this array.  For instance:
+#     MODULES="piix ide_disk reiserfs"
+MODULES="nfs"
+
+# BINARIES
+# This setting includes any additional binaries a given user may
+# wish into the CPIO image.  This is run first, so it may be used to
+# override the actual binaries used in a given hook.
+# (Existing files are NOT overwritten if already added)
+# BINARIES are dependency parsed, so you may safely ignore libraries
+BINARIES=""
+
+# FILES
+# This setting is similar to BINARIES above, however, files are added
+# as-is and are not parsed in any way.  This is useful for config files.
+# Some users may wish to include modprobe.conf for custom module options
+# like so:
+#    FILES="/etc/modprobe.d/modprobe.conf"
+FILES=""
+
+# HOOKS
+# This is the most important setting in this file.  The HOOKS control the
+# modules and scripts added to the image, and what happens at boot time.
+# Order is important, and it is recommended that you do not change the
+# order in which HOOKS are added.  Run 'mkinitcpio -H <hook name>' for
+# help on a given hook.
+# 'base' is _required_ unless you know precisely what you are doing.
+# 'udev' is _required_ in order to automatically load modules
+# 'filesystems' is _required_ unless you specify your fs modules in MODULES
+# Examples:
+##   This setup specifies all modules in the MODULES setting above.
+##   No raid, lvm2, or encrypted root is needed.
+#    HOOKS="base"
+#
+##   This setup will autodetect all modules for your system and should
+##   work as a sane default
+#    HOOKS="base udev autodetect pata scsi sata filesystems"
+#
+##   This is identical to the above, except the old ide subsystem is
+##   used for IDE devices instead of the new pata subsystem.
+#    HOOKS="base udev autodetect ide scsi sata filesystems"
+#
+##   This setup will generate a 'full' image which supports most systems.
+##   No autodetection is done.
+#    HOOKS="base udev pata scsi sata usb filesystems"
+#
+##   This setup assembles a pata mdadm array with an encrypted root FS.
+##   Note: See 'mkinitcpio -H mdadm' for more information on raid devices.
+#    HOOKS="base udev pata mdadm encrypt filesystems"
+#
+##   This setup loads an lvm2 volume group on a usb device.
+#    HOOKS="base udev usb lvm2 filesystems"
+HOOKS="base udev usb net autodetect pata scsi sata filesystems usbinput fbsplash larch"
+
+# COMPRESSION
+# Use this to compress the initramfs image. With kernels earlier than
+# 2.6.30, only gzip is supported, which is also the default. Newer kernels
+# support gzip, bzip2 and lzma. Kernels 2.6.38 and later support xz
+# compression.
+#COMPRESSION="gzip"
+#COMPRESSION="bzip2"
+COMPRESSION="lzma"
+#COMPRESSION="xz"
+#COMPRESSION="lzop"
+
+# COMPRESSION_OPTIONS
+# Additional options for the compressor
+#COMPRESSION_OPTIONS=""
diff --git a/build_tools/larch8/larch0/profiles/linhes-remote-stable-i686/rootoverlay/etc/mkinitcpio.conf.larch0 b/build_tools/larch8/larch0/profiles/linhes-remote-stable-i686/rootoverlay/etc/mkinitcpio.conf.larch0
new file mode 100644
index 0000000..b500db2
--- /dev/null
+++ b/build_tools/larch8/larch0/profiles/linhes-remote-stable-i686/rootoverlay/etc/mkinitcpio.conf.larch0
@@ -0,0 +1,72 @@
+# vim:set ft=sh
+# MODULES
+# The following modules are loaded before any boot hooks are
+# run.  Advanced users may wish to specify all system modules
+# in this array.  For instance:
+#     MODULES="piix ide_disk reiserfs"
+MODULES="nfs"
+
+# BINARIES
+# This setting includes any additional binaries a given user may
+# wish into the CPIO image.  This is run first, so it may be used to
+# override the actual binaries used in a given hook.
+# (Existing files are NOT overwritten if already added)
+# BINARIES are dependency parsed, so you may safely ignore libraries
+BINARIES=""
+
+# FILES
+# This setting is similar to BINARIES above, however, files are added
+# as-is and are not parsed in any way.  This is useful for config files.
+# Some users may wish to include modprobe.conf for custom module options
+# like so:
+#    FILES="/etc/modprobe.d/modprobe.conf"
+FILES=""
+
+# HOOKS
+# This is the most important setting in this file.  The HOOKS control the
+# modules and scripts added to the image, and what happens at boot time.
+# Order is important, and it is recommended that you do not change the
+# order in which HOOKS are added.  Run 'mkinitcpio -H <hook name>' for
+# help on a given hook.
+# 'base' is _required_ unless you know precisely what you are doing.
+# 'udev' is _required_ in order to automatically load modules
+# 'filesystems' is _required_ unless you specify your fs modules in MODULES
+# Examples:
+##   This setup specifies all modules in the MODULES setting above.
+##   No raid, lvm2, or encrypted root is needed.
+#    HOOKS="base"
+#
+##   This setup will autodetect all modules for your system and should
+##   work as a sane default
+#    HOOKS="base udev autodetect pata scsi sata filesystems"
+#
+##   This is identical to the above, except the old ide subsystem is
+##   used for IDE devices instead of the new pata subsystem.
+#    HOOKS="base udev autodetect ide scsi sata filesystems"
+#
+##   This setup will generate a 'full' image which supports most systems.
+##   No autodetection is done.
+#    HOOKS="base udev pata scsi sata usb filesystems"
+#
+##   This setup assembles a pata mdadm array with an encrypted root FS.
+##   Note: See 'mkinitcpio -H mdadm' for more information on raid devices.
+#    HOOKS="base udev pata mdadm encrypt filesystems"
+#
+##   This setup loads an lvm2 volume group on a usb device.
+#    HOOKS="base udev usb lvm2 filesystems"
+HOOKS="base udev usb net autodetect pata scsi sata filesystems usbinput fbsplash larch"
+
+# COMPRESSION
+# Use this to compress the initramfs image. With kernels earlier than
+# 2.6.30, only gzip is supported, which is also the default. Newer kernels
+# support gzip, bzip2 and lzma. Kernels 2.6.38 and later support xz
+# compression.
+#COMPRESSION="gzip"
+#COMPRESSION="bzip2"
+COMPRESSION="lzma"
+#COMPRESSION="xz"
+#COMPRESSION="lzop"
+
+# COMPRESSION_OPTIONS
+# Additional options for the compressor
+#COMPRESSION_OPTIONS=""
diff --git a/build_tools/larch8/larch0/profiles/linhes-remote-testing-i686/addedpacks b/build_tools/larch8/larch0/profiles/linhes-remote-testing-i686/addedpacks
index 21c6359..7c1f75e 100755
--- a/build_tools/larch8/larch0/profiles/linhes-remote-testing-i686/addedpacks
+++ b/build_tools/larch8/larch0/profiles/linhes-remote-testing-i686/addedpacks
@@ -142,9 +142,8 @@ pkgconfig
 taglib
 #portmap
 ivtv-utils
-#disabled due to conflicts with linux-firmware
 
-#dvb-firmware
+dvb-firmware
 dbus-python
 
 #MythVantage Installer deps
diff --git a/build_tools/larch8/larch0/profiles/linhes-remote-testing-i686/rootoverlay/etc/mkinitcpio.conf.larch0 b/build_tools/larch8/larch0/profiles/linhes-remote-testing-i686/rootoverlay/etc/mkinitcpio.conf.larch0
new file mode 100644
index 0000000..b500db2
--- /dev/null
+++ b/build_tools/larch8/larch0/profiles/linhes-remote-testing-i686/rootoverlay/etc/mkinitcpio.conf.larch0
@@ -0,0 +1,72 @@
+# vim:set ft=sh
+# MODULES
+# The following modules are loaded before any boot hooks are
+# run.  Advanced users may wish to specify all system modules
+# in this array.  For instance:
+#     MODULES="piix ide_disk reiserfs"
+MODULES="nfs"
+
+# BINARIES
+# This setting includes any additional binaries a given user may
+# wish into the CPIO image.  This is run first, so it may be used to
+# override the actual binaries used in a given hook.
+# (Existing files are NOT overwritten if already added)
+# BINARIES are dependency parsed, so you may safely ignore libraries
+BINARIES=""
+
+# FILES
+# This setting is similar to BINARIES above, however, files are added
+# as-is and are not parsed in any way.  This is useful for config files.
+# Some users may wish to include modprobe.conf for custom module options
+# like so:
+#    FILES="/etc/modprobe.d/modprobe.conf"
+FILES=""
+
+# HOOKS
+# This is the most important setting in this file.  The HOOKS control the
+# modules and scripts added to the image, and what happens at boot time.
+# Order is important, and it is recommended that you do not change the
+# order in which HOOKS are added.  Run 'mkinitcpio -H <hook name>' for
+# help on a given hook.
+# 'base' is _required_ unless you know precisely what you are doing.
+# 'udev' is _required_ in order to automatically load modules
+# 'filesystems' is _required_ unless you specify your fs modules in MODULES
+# Examples:
+##   This setup specifies all modules in the MODULES setting above.
+##   No raid, lvm2, or encrypted root is needed.
+#    HOOKS="base"
+#
+##   This setup will autodetect all modules for your system and should
+##   work as a sane default
+#    HOOKS="base udev autodetect pata scsi sata filesystems"
+#
+##   This is identical to the above, except the old ide subsystem is
+##   used for IDE devices instead of the new pata subsystem.
+#    HOOKS="base udev autodetect ide scsi sata filesystems"
+#
+##   This setup will generate a 'full' image which supports most systems.
+##   No autodetection is done.
+#    HOOKS="base udev pata scsi sata usb filesystems"
+#
+##   This setup assembles a pata mdadm array with an encrypted root FS.
+##   Note: See 'mkinitcpio -H mdadm' for more information on raid devices.
+#    HOOKS="base udev pata mdadm encrypt filesystems"
+#
+##   This setup loads an lvm2 volume group on a usb device.
+#    HOOKS="base udev usb lvm2 filesystems"
+HOOKS="base udev usb net autodetect pata scsi sata filesystems usbinput fbsplash larch"
+
+# COMPRESSION
+# Use this to compress the initramfs image. With kernels earlier than
+# 2.6.30, only gzip is supported, which is also the default. Newer kernels
+# support gzip, bzip2 and lzma. Kernels 2.6.38 and later support xz
+# compression.
+#COMPRESSION="gzip"
+#COMPRESSION="bzip2"
+COMPRESSION="lzma"
+#COMPRESSION="xz"
+#COMPRESSION="lzop"
+
+# COMPRESSION_OPTIONS
+# Additional options for the compressor
+#COMPRESSION_OPTIONS=""