Browse Source

misc finetuning

Waldemar Brodkorb 14 năm trước cách đây
mục cha
commit
7d7d0ad0d6

+ 3 - 3
package/font-util/Makefile

@@ -26,12 +26,12 @@ $(eval $(call PKG_template,FONT_UTIL_DEV,font-util-dev,${PKG_VERSION}-${PKG_RELE
 # especially as all font packages still need patching to avoid
 # calling pkg-config (which we don't provide) in order to
 # automatically find the mappings.
-fonts-hack:
+post-build:
 	${INSTALL_DIR} ${STAGING_DIR}/usr/share/fonts/X11/util
-	${CP} ${WRKINST}/usr/share/fonts/X11/util/* \
+	${CP} ${WRKBUILD}/map-* \
 		${STAGING_DIR}/usr/share/fonts/X11/util
 
-font-util-install: fonts-hack
+font-util-install:
 	${INSTALL_DIR} ${IDIR_FONT_UTIL}/usr/bin
 	${INSTALL_BIN} ${WRKINST}/usr/bin/ucs2any \
 		${IDIR_FONT_UTIL}/usr/bin

+ 1 - 1
package/section.lst

@@ -45,6 +45,6 @@ x11/apps	X applications
 x11/drivers	X drivers
 x11/server	X server 
 x11/libs	X libraries
-x11/misc	X Misc
+x11/misc	X misc
 x11/fonts	X fonts
 x11/devel	X headers

+ 2 - 0
package/sox/Makefile

@@ -18,6 +18,8 @@ include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,SOX,sox,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
+CONFIGURE_ARGS+=	--without-ffmpeg
+
 sox-install:
 	$(INSTALL_DIR) $(IDIR_SOX)/usr/lib
 	${CP} ${WRKINST}/usr/lib/libsox.so* $(IDIR_SOX)/usr/lib

+ 3 - 2
target/linux/config/Config.in.fs

@@ -45,7 +45,7 @@ config ADK_KERNEL_FAT_DEFAULT_IOCHARSET
 	default "iso8859-1"
 
 config ADK_KERNEL_SQUASHFS
-	prompt ".................................. SquashFS filesystem"
+	prompt "squashfs.......................... SquashFS filesystem"
 	boolean
 	select ADK_KERNEL_MISC_FILESYSTEMS
 	default n
@@ -181,12 +181,13 @@ config ADK_KPACKAGE_KMOD_VFAT_FS
 
 
 config ADK_KERNEL_XFS_FS
+	prompt "xfs............................... XFS filesystem support (kernel)"
 	boolean
 	select ADK_KERNEL_EXPORTFS
 	default n
 
 config ADK_KPACKAGE_KMOD_XFS_FS
-	prompt "kmod-fs-xfs....................... XFS filesystem support"
+	prompt "kmod-fs-xfs....................... XFS filesystem support (module)"
 	tristate
 	select ADK_KERNEL_EXPORTFS
 	depends on !ADK_KERNEL_XFS_FS

+ 10 - 1
target/packages/pkg-available/development

@@ -10,6 +10,7 @@ config ADK_PKG_DEVELOPMENT
 	select ADK_PACKAGE_GCC
 	select ADK_PACKAGE_GIT
 	select ADK_PACKAGE_GREP
+	select ADK_PACKAGE_TAR
 	select ADK_PACKAGE_UCLIBC_DEV if ADK_TARGET_LIB_UCLIBC
 	select ADK_PACKAGE_EGLIBC_DEV if ADK_TARGET_LIB_EGLIBC
 	select ADK_PACKAGE_GLIBC_DEV if ADK_TARGET_LIB_GLIBC
@@ -30,9 +31,17 @@ config ADK_PKG_DEVELOPMENT
 	select ADK_PACKAGE_ZLIB
 	select ADK_PACKAGE_ZLIB_DEV
 	select ADK_PACKAGE_XZ
+	# optional
+	select ADK_PACKAGE_STRACE
+	select ADK_PACKAGE_GDB
+	select ADK_PACKAGE_FLEX
+	select ADK_PACKAGE_BISON
+	select ADK_PACKAGE_AUTOCONF
+	select ADK_PACKAGE_AUTOMAKE
+	select ADK_PACKAGE_LIBTOOL
 	help
 	  After bootstrapping a Linux system you might want to
 	  switch to native builds with your target. 
-	  If you choose this option, all necessary software needed
+	  If you choose this option, all software required
 	  for native building will be selected by this option.
 

+ 9 - 1
target/packages/pkg-available/laptop

@@ -1,5 +1,5 @@
 config ADK_PKG_LAPTOP
-	bool "Choose packages for a laptop system with X"
+	bool "Choose packages for my laptop system with X"
 	default n
 	select ADK_PACKAGE_SCREEN
 	select ADK_PACKAGE_VIM
@@ -16,10 +16,18 @@ config ADK_PKG_LAPTOP
 	select ADK_PACKAGE_XORG_SERVER_WITH_DRI
 	select ADK_PACKAGE_XF86_INPUT_KEYBOARD
 	select ADK_PACKAGE_XF86_INPUT_MOUSE
+	select ADK_PACKAGE_XF86_VIDEO_SILICONMOTION if ADK_TARGET_SYSTEM_LEMOTE_YEELONG
+	select ADK_PACKAGE_FONT_MISC_MISC
 	select ADK_PACKAGE_SETXKBMAP
 	select ADK_PACKAGE_XBINDKEYS
 	select ADK_PACKAGE_DISPLAY
+	select ADK_PACKAGE_FEH
 	select ADK_PACKAGE_XINIT
 	select ADK_PACKAGE_EVILWM
 	select ADK_PACKAGE_FIREFOX
+	select ADK_PACKAGE_DILLO
 	select ADK_PACKAGE_MPLAYER
+	select ADK_PACKAGE_MPC
+	select ADK_PACKAGE_WPA_SUPPLICANT
+	select ADK_PACKAGE_WPA_SUPPLICANT_WITH_OPENSSL
+	select ADK_KPACKAGE_KMOD_USB_STORAGE