diff options
| author | Greg Frost <gregfrost1@bigpond.com> | 2009-07-28 11:49:26 (GMT) |
|---|---|---|
| committer | Greg Frost <gregfrost1@bigpond.com> | 2009-07-28 11:49:26 (GMT) |
| commit | 306c0b571a01dd961f06f88f97a2e72344da50b1 (patch) | |
| tree | 499bd15a3adc5374d333d9962a0ccb4bc0608f13 | |
| parent | c77b283f0d751fdf2926ba439ec56b71234c353d (diff) | |
| parent | e142fc01ba0236659ba33cc8348606c5e6a95bbb (diff) | |
| download | linhes_dev-306c0b571a01dd961f06f88f97a2e72344da50b1.zip | |
Merge branch 'master' of ssh://gregfrost@knoppmyth.net/mount/repository/LinHES-dev
8 files changed, 11 insertions, 2 deletions
diff --git a/build_tools/clarch/larch/profiles/i686-testing-REMOTE/addedpacks b/build_tools/clarch/larch/profiles/i686-testing-REMOTE/addedpacks index 3e9cb3e..1d98bea 100644 --- a/build_tools/clarch/larch/profiles/i686-testing-REMOTE/addedpacks +++ b/build_tools/clarch/larch/profiles/i686-testing-REMOTE/addedpacks @@ -206,6 +206,7 @@ aumix tablet-encode ntfs-3g joyutils +ffmpeg-svn #---Firewire libraw1394 libavc1394 diff --git a/build_tools/clarch/larch/profiles/i686-testing-REMOTE/cache_packs b/build_tools/clarch/larch/profiles/i686-testing-REMOTE/cache_packs index a121a8d..8b6b1eb 100644 --- a/build_tools/clarch/larch/profiles/i686-testing-REMOTE/cache_packs +++ b/build_tools/clarch/larch/profiles/i686-testing-REMOTE/cache_packs @@ -1,8 +1,10 @@ mythdb-initial nvidia nvidia-utils +vdpinfo nvidia-96xx nvidia-96xx-utils +vdpinfo-96xx lighttpd local-website mythweb diff --git a/build_tools/clarch/larch/profiles/i686-testing-REMOTE/cd-root/isolinux/hardsub.cfg b/build_tools/clarch/larch/profiles/i686-testing-REMOTE/cd-root/isolinux/hardsub.cfg index c5fe266..847276c 100644 --- a/build_tools/clarch/larch/profiles/i686-testing-REMOTE/cd-root/isolinux/hardsub.cfg +++ b/build_tools/clarch/larch/profiles/i686-testing-REMOTE/cd-root/isolinux/hardsub.cfg @@ -14,7 +14,7 @@ MENU TITLE LinHES: The Linux Home Entertainment System label atomic MENU LABEL LinHES on Atomic Ant! kernel vmlinuz -append initrd=larch.img vga=792 quiet splash=silent,theme:linhes console=tty1 disablemodules=agpart,intel_agp +append initrd=larch.img vga=792 quiet splash=silent,theme:linhes console=tty1 disablemodules=agpart,intel_agp #label linux-i810 #MENU LABEL with Intel i810 driver (DRI disabled) diff --git a/build_tools/clarch/larch/profiles/i686-testing-local-httpd/addedpacks b/build_tools/clarch/larch/profiles/i686-testing-local-httpd/addedpacks index 3e9cb3e..1d98bea 100644 --- a/build_tools/clarch/larch/profiles/i686-testing-local-httpd/addedpacks +++ b/build_tools/clarch/larch/profiles/i686-testing-local-httpd/addedpacks @@ -206,6 +206,7 @@ aumix tablet-encode ntfs-3g joyutils +ffmpeg-svn #---Firewire libraw1394 libavc1394 diff --git a/build_tools/clarch/larch/profiles/i686-testing-local-httpd/cache_packs b/build_tools/clarch/larch/profiles/i686-testing-local-httpd/cache_packs index a121a8d..8b6b1eb 100644 --- a/build_tools/clarch/larch/profiles/i686-testing-local-httpd/cache_packs +++ b/build_tools/clarch/larch/profiles/i686-testing-local-httpd/cache_packs @@ -1,8 +1,10 @@ mythdb-initial nvidia nvidia-utils +vdpinfo nvidia-96xx nvidia-96xx-utils +vdpinfo-96xx lighttpd local-website mythweb diff --git a/build_tools/clarch/larch/profiles/i686-testing-local-httpd/cd-root/isolinux/hardsub.cfg b/build_tools/clarch/larch/profiles/i686-testing-local-httpd/cd-root/isolinux/hardsub.cfg index c5fe266..847276c 100644 --- a/build_tools/clarch/larch/profiles/i686-testing-local-httpd/cd-root/isolinux/hardsub.cfg +++ b/build_tools/clarch/larch/profiles/i686-testing-local-httpd/cd-root/isolinux/hardsub.cfg @@ -14,7 +14,7 @@ MENU TITLE LinHES: The Linux Home Entertainment System label atomic MENU LABEL LinHES on Atomic Ant! kernel vmlinuz -append initrd=larch.img vga=792 quiet splash=silent,theme:linhes console=tty1 disablemodules=agpart,intel_agp +append initrd=larch.img vga=792 quiet splash=silent,theme:linhes console=tty1 disablemodules=agpart,intel_agp #label linux-i810 #MENU LABEL with Intel i810 driver (DRI disabled) diff --git a/build_tools/clarch/larch/profiles/i686-testing-local/addedpacks b/build_tools/clarch/larch/profiles/i686-testing-local/addedpacks index 3e9cb3e..1d98bea 100644 --- a/build_tools/clarch/larch/profiles/i686-testing-local/addedpacks +++ b/build_tools/clarch/larch/profiles/i686-testing-local/addedpacks @@ -206,6 +206,7 @@ aumix tablet-encode ntfs-3g joyutils +ffmpeg-svn #---Firewire libraw1394 libavc1394 diff --git a/build_tools/clarch/larch/profiles/i686-testing-local/cache_packs b/build_tools/clarch/larch/profiles/i686-testing-local/cache_packs index a121a8d..8b6b1eb 100644 --- a/build_tools/clarch/larch/profiles/i686-testing-local/cache_packs +++ b/build_tools/clarch/larch/profiles/i686-testing-local/cache_packs @@ -1,8 +1,10 @@ mythdb-initial nvidia nvidia-utils +vdpinfo nvidia-96xx nvidia-96xx-utils +vdpinfo-96xx lighttpd local-website mythweb |