From 38d26eccaf74b5b06ebd5692db3043bd3cc4717c Mon Sep 17 00:00:00 2001 From: terratec Date: Fri, 19 Aug 2011 21:45:39 +0200 Subject: [PATCH 1/4] remove double project options --- projects/ATV/options | 3 --- projects/Fusion/options | 3 --- projects/Generic/options | 3 --- projects/ION/options | 3 --- projects/Intel/options | 3 --- 5 files changed, 15 deletions(-) diff --git a/projects/ATV/options b/projects/ATV/options index 7cde6a4c3f..d1c79f6a65 100644 --- a/projects/ATV/options +++ b/projects/ATV/options @@ -152,9 +152,6 @@ # build and install Avahi (Zeroconf) daemon (yes / no) AVAHI_DAEMON="yes" -# build and install with NFS mount support in XBMC (yes / no) - NFS_SUPPORT="yes" - # build and install Samba Server (yes / no) SAMBA_SERVER="yes" diff --git a/projects/Fusion/options b/projects/Fusion/options index 7b1e0acaaa..055ea0b03c 100644 --- a/projects/Fusion/options +++ b/projects/Fusion/options @@ -152,9 +152,6 @@ # build and install Avahi (Zeroconf) daemon (yes / no) AVAHI_DAEMON="yes" -# build and install with NFS mount support in XBMC (yes / no) - NFS_SUPPORT="yes" - # build and install Samba Server (yes / no) SAMBA_SERVER="yes" diff --git a/projects/Generic/options b/projects/Generic/options index 81adc4d72f..75627ed66c 100644 --- a/projects/Generic/options +++ b/projects/Generic/options @@ -152,9 +152,6 @@ # build and install Avahi (Zeroconf) daemon (yes / no) AVAHI_DAEMON="yes" -# build and install with NFS mount support in XBMC (yes / no) - NFS_SUPPORT="yes" - # build and install Samba Server (yes / no) SAMBA_SERVER="yes" diff --git a/projects/ION/options b/projects/ION/options index e24d15fcd6..d1f8afc3d5 100644 --- a/projects/ION/options +++ b/projects/ION/options @@ -152,9 +152,6 @@ # build and install Avahi (Zeroconf) daemon (yes / no) AVAHI_DAEMON="yes" -# build and install with NFS mount support in XBMC (yes / no) - NFS_SUPPORT="yes" - # build and install Samba Server (yes / no) SAMBA_SERVER="yes" diff --git a/projects/Intel/options b/projects/Intel/options index cd1a213615..82008299da 100644 --- a/projects/Intel/options +++ b/projects/Intel/options @@ -152,9 +152,6 @@ # build and install Avahi (Zeroconf) daemon (yes / no) AVAHI_DAEMON="yes" -# build and install with NFS mount support in XBMC (yes / no) - NFS_SUPPORT="yes" - # build and install Samba Server (yes / no) SAMBA_SERVER="yes" From a64f59d24e7745e111d6f36282146ddef50c57c9 Mon Sep 17 00:00:00 2001 From: terratec Date: Sun, 21 Aug 2011 15:44:29 +0200 Subject: [PATCH 2/4] xf86-video-intel: fix double entry --- packages/x11/driver/xf86-video-intel/meta | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/x11/driver/xf86-video-intel/meta b/packages/x11/driver/xf86-video-intel/meta index 97f6cb2ee8..5845324062 100644 --- a/packages/x11/driver/xf86-video-intel/meta +++ b/packages/x11/driver/xf86-video-intel/meta @@ -26,7 +26,7 @@ PKG_LICENSE="OSS" PKG_SITE="http://intellinuxgraphics.org/" PKG_URL="http://xorg.freedesktop.org/archive/individual/driver/$PKG_NAME-$PKG_VERSION.tar.bz2" PKG_DEPENDS="udev" -PKG_BUILD_DEPENDS="toolchain util-macros util-macros fontsproto udev xorg-server" +PKG_BUILD_DEPENDS="toolchain util-macros fontsproto udev xorg-server" PKG_PRIORITY="optional" PKG_SECTION="x11/driver" PKG_SHORTDESC="xf86-video-intel: The Xorg driver for Intel video chips" From fea210e18f2d21592a5dea0ba91ce9f0ab5cd768 Mon Sep 17 00:00:00 2001 From: terratec Date: Sun, 21 Aug 2011 15:52:54 +0200 Subject: [PATCH 3/4] fix double LINUX_NEXT option --- projects/ATV/options | 3 --- projects/Fusion/options | 3 --- projects/Generic/options | 5 +---- projects/ION/options | 3 --- projects/Intel/options | 3 --- projects/Ultra/options | 3 --- 6 files changed, 1 insertion(+), 19 deletions(-) diff --git a/projects/ATV/options b/projects/ATV/options index d1c79f6a65..a2131ff6b1 100644 --- a/projects/ATV/options +++ b/projects/ATV/options @@ -186,9 +186,6 @@ # e.g. GRAPHIC_DRIVERS="i915 i965 r300 r600 radeon nvidia nouveau" GRAPHIC_DRIVERS="nouveau" -# use linux-next (latest rc) instead latest released version - LINUX_NEXT="no" - # Use VDPAU video acceleration (needs nVidia driver and a supported card) VDPAU="no" diff --git a/projects/Fusion/options b/projects/Fusion/options index 055ea0b03c..93d1f112ff 100644 --- a/projects/Fusion/options +++ b/projects/Fusion/options @@ -186,9 +186,6 @@ # e.g. GRAPHIC_DRIVERS="i915 i965 r300 r600 radeon fglrx nvidia nouveau" GRAPHIC_DRIVERS="fglrx" -# use linux-next (latest rc) instead latest released version - LINUX_NEXT="no" - # Use VDPAU video acceleration (needs nVidia driver and a supported card) VDPAU="no" diff --git a/projects/Generic/options b/projects/Generic/options index 75627ed66c..2c042f54a6 100644 --- a/projects/Generic/options +++ b/projects/Generic/options @@ -186,10 +186,7 @@ # e.g. GRAPHIC_DRIVERS="i915 i965 r300 r600 nvidia nouveau" GRAPHIC_DRIVERS="i915 i965 r200 r300 r600 nvidia vmware" -# Use VDPAU video# use linux-next (latest rc) instead latest released version - LINUX_NEXT="no" - -# acceleration (needs nVidia driver and a supported card) +# Use VDPAU video acceleration (needs nVidia driver and a supported card) VDPAU="yes" # Use VAAPI video acceleration (needs intel i965 driver and a supported card) diff --git a/projects/ION/options b/projects/ION/options index d1f8afc3d5..75fe49048b 100644 --- a/projects/ION/options +++ b/projects/ION/options @@ -186,9 +186,6 @@ # e.g. GRAPHIC_DRIVERS="i915 i965 r300 r600 radeon nvidia nouveau" GRAPHIC_DRIVERS="nvidia" -# use linux-next (latest rc) instead latest released version - LINUX_NEXT="no" - # Use VDPAU video acceleration (needs nVidia driver and a supported card) VDPAU="yes" diff --git a/projects/Intel/options b/projects/Intel/options index 82008299da..0eaf4e3c2f 100644 --- a/projects/Intel/options +++ b/projects/Intel/options @@ -186,9 +186,6 @@ # e.g. GRAPHIC_DRIVERS="i915 i965 r300 r600 radeon nvidia nouveau" GRAPHIC_DRIVERS="i915 i965" -# use linux-next (latest rc) instead latest released version - LINUX_NEXT="no" - # Use VDPAU video acceleration (needs nVidia driver and a supported card) VDPAU="no" diff --git a/projects/Ultra/options b/projects/Ultra/options index 169f662445..cc061a3459 100644 --- a/projects/Ultra/options +++ b/projects/Ultra/options @@ -186,9 +186,6 @@ # e.g. GRAPHIC_DRIVERS="i915 i965 r300 r600 radeon nvidia nouveau" GRAPHIC_DRIVERS="nvidia" -# use linux-next (latest rc) instead latest released version - LINUX_NEXT="no" - # Use VDPAU video acceleration (needs nVidia driver and a supported card) VDPAU="yes" From b28fb1953a38a39691184df58ee0062e979edd39 Mon Sep 17 00:00:00 2001 From: terratec Date: Sun, 21 Aug 2011 16:02:25 +0200 Subject: [PATCH 4/4] scripts/image: fix installer support comment --- scripts/image | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/image b/scripts/image index 03747fec92..6485ffaa63 100755 --- a/scripts/image +++ b/scripts/image @@ -139,7 +139,7 @@ IMAGE_NAME="$DISTRONAME-$TARGET_VERSION" # Update support [ "$UPDATE_SUPPORT" = "yes" ] && $SCRIPTS/install autoupdate -# Update support +# Installer support [ "$INSTALLER_SUPPORT" = "yes" ] && $SCRIPTS/install installer # Devtools... (not for Release)