From 1ef5fe6c63313a697c5029d4804a26519b22ca3b Mon Sep 17 00:00:00 2001
From: Xiangfu Liu <xiangfu@sharism.cc>
Date: Mon, 24 Jan 2011 01:17:22 +0800
Subject: [PATCH] merge all_package and full_system to one

---
 data/qi_lb60/conf/config.all_packages | 30 ---------------------------
 data/qi_lb60/conf/config.full_system  | 15 ++++++++++++++
 2 files changed, 15 insertions(+), 30 deletions(-)
 delete mode 100644 data/qi_lb60/conf/config.all_packages

diff --git a/data/qi_lb60/conf/config.all_packages b/data/qi_lb60/conf/config.all_packages
deleted file mode 100644
index c4f1e1cf0..000000000
--- a/data/qi_lb60/conf/config.all_packages
+++ /dev/null
@@ -1,30 +0,0 @@
-#
-# This file must be copied to .config in the OpenWrt root folder,
-# then run: yes "" | make oldconfig > /dev/null
-#
-# To skip broken packages, run make IGNORE_ERRORS=m
-# to fix $(HOST_FPIC) usage in packages/python-sip/Makefile
-# export HOST_FPIC=-fPIC
-# need to exclude mp3, mpeg4
-#
-
-CONFIG_TARGET_xburst=y
-CONFIG_TARGET_xburst_qi_lb60=y
-# CONFIG_TARGET_ROOTFS_TARGZ is not set
-# CONFIG_TARGET_ROOTFS_JFFS2 is not set
-# CONFIG_TARGET_ROOTFS_UBIFS is not set
-# CONFIG_BUILD_PATENTED is not set
-
-CONFIG_ALL=y
-
-# CONFIG_PACKAGE_uboot-xburst-qi_lb60 is not set
-# CONFIG_PACKAGE_uboot-xburst-avt2 is not set
-# CONFIG_PACKAGE_uboot-xburst-n516 is not set
-# CONFIG_PACKAGE_uboot-xburst-qi_lb60 is not set
-# CONFIG_PACKAGE_uboot-xburst-sakc is not set
-
-# CONFIG_PACKAGE_asterisk14-format-mp3 is not set
-# CONFIG_FFMPEG_MUXER_mp3 is not set
-# CONFIG_FFMPEG_MUXER_mp4 is not set
-# CONFIG_FFMPEG_DEMUXER_mp3 is not set
-# CONFIG_FFMPEG_PARSER_mpeg4video is not set
diff --git a/data/qi_lb60/conf/config.full_system b/data/qi_lb60/conf/config.full_system
index af5d0287a..3126d179e 100644
--- a/data/qi_lb60/conf/config.full_system
+++ b/data/qi_lb60/conf/config.full_system
@@ -2,6 +2,9 @@
 # This file must be copied to .config in the OpenWrt root folder,
 # then run: yes "" | make oldconfig > /dev/null
 #
+# To skip broken module packages, run make IGNORE_ERRORS=m
+# need to exclude patented packages
+#
 
 CONFIG_TARGET_xburst=y
 CONFIG_TARGET_xburst_qi_lb60=y
@@ -20,6 +23,8 @@ CONFIG_INSTALL_GFORTRAN=y
 
 CONFIG_SDK=y
 
+CONFIG_ALL=y
+
 CONFIG_BUSYBOX_CONFIG_FEATURE_EDITING_SAVEHISTORY=y
 CONFIG_BUSYBOX_CONFIG_FEATURE_VOLUMEID_JFS=y
 CONFIG_BUSYBOX_CONFIG_FEATURE_VOLUMEID_LINUXRAID=y
@@ -42,6 +47,16 @@ CONFIG_BUSYBOX_CONFIG_FEATURE_VI_8BIT=y
 CONFIG_BUSYBOX_CONFIG_STAT=y
 CONFIG_BUSYBOX_CONFIG_HOSTNAME=y
 CONFIG_BUSYBOX_CONFIG_STTY=y
+
+#
+# Disable all patented packages
+#
+# CONFIG_PACKAGE_asterisk14-format-mp3 is not set
+# CONFIG_FFMPEG_MUXER_mp3 is not set
+# CONFIG_FFMPEG_MUXER_mp4 is not set
+# CONFIG_FFMPEG_DEMUXER_mp3 is not set
+# CONFIG_FFMPEG_PARSER_mpeg4video is not set
+
 #
 # system
 #