From a83edbe870a56efbded1d77d6fc16761987f2200 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 2 Jan 2011 20:38:42 +0100 Subject: when creating package flavours, depend on main package --- tools/adk/pkgmaker.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/adk/pkgmaker.c b/tools/adk/pkgmaker.c index abcfbfc20..cee3f1420 100644 --- a/tools/adk/pkgmaker.c +++ b/tools/adk/pkgmaker.c @@ -632,7 +632,7 @@ int main() { fprintf(cfg, "\"%s\"\n", pkg_fd); fprintf(cfg, "\tdefault n\n"); - fprintf(cfg, "\tdepends on ADK_COMPILE_%s\n", toupperstr(pkgdirp->d_name)); + fprintf(cfg, "\tdepends on ADK_PACKAGE_%s\n", toupperstr(pkgdirp->d_name)); strncat(hkey, "PKGFS_", 6); strncat(hkey, token, strlen(token)); -- cgit v1.2.3 From 3322bd4ee175042e5596777bbcefd9096b314cf9 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Mon, 3 Jan 2011 17:03:29 +0100 Subject: ignore warning, when not found --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index e465732bb..d5c583c56 100644 --- a/Makefile +++ b/Makefile @@ -218,7 +218,7 @@ NO_ERROR=0 @echo 'HOSTCFLAGS:=-O2' >>prereq.mk @echo 'HOSTCXX:=${CXX}' >>prereq.mk @echo 'HOSTCXXFLAGS:=-O2' >>prereq.mk - @echo "HOST_LIBIDL_CONFIG:=$$(which libIDL-config-2)" >>prereq.mk + @echo "HOST_LIBIDL_CONFIG:=$$(which libIDL-config-2 2>/dev/null)" >>prereq.mk @echo "PKG_HOSTLIB_DIR:=$$(pkg-config --variable pc_path pkg-config)" >>prereq.mk @echo 'LANGUAGE:=C' >>prereq.mk @echo 'LC_ALL:=C' >>prereq.mk -- cgit v1.2.3 From 098a23b35bf8c4017e79c57ad062d971f4483184 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Mon, 3 Jan 2011 17:09:43 +0100 Subject: update mplayer to latest svn --- package/mplayer/Makefile | 18 +++++++++++------- package/mplayer/patches/patch-configure | 20 -------------------- package/mplayer/patches/patch-libvo_vo_dga_c | 11 +++++++++++ 3 files changed, 22 insertions(+), 27 deletions(-) delete mode 100644 package/mplayer/patches/patch-configure create mode 100644 package/mplayer/patches/patch-libvo_vo_dga_c diff --git a/package/mplayer/Makefile b/package/mplayer/Makefile index 0bef82316..bad5c656d 100644 --- a/package/mplayer/Makefile +++ b/package/mplayer/Makefile @@ -4,9 +4,9 @@ include ${TOPDIR}/rules.mk PKG_NAME:= mplayer -PKG_VERSION:= 1.0-31868 +PKG_VERSION:= 1.0-32749 PKG_RELEASE:= 1 -PKG_MD5SUM:= 9d5c2c1c927947b31afa6f42c11e8f23 +PKG_MD5SUM:= aadc5d8cca503c8b18b3ed00b3a52cf5 PKG_DESCR:= popular video player PKG_SECTION:= multimedia PKG_DEPENDS:= alsa-lib libjpeg libfaad2 libmad libncurses @@ -53,14 +53,19 @@ else CONFIGURE_CPU_OPTS:= --disable-mmx endif ifeq (${ADK_TARGET_CPU_WITH_MMXEXT},y) -CONFIGURE_CPU_OPTS:= --enable-mmxext +CONFIGURE_CPU_OPTS+= --enable-mmxext else -CONFIGURE_CPU_OPTS:= --disable-mmxext +CONFIGURE_CPU_OPTS+= --disable-mmxext endif ifeq (${ADK_TARGET_CPU_WITH_SSE},y) -CONFIGURE_CPU_OPTS:= --enable-sse +CONFIGURE_CPU_OPTS+= --enable-sse else -CONFIGURE_CPU_OPTS:= --disable-sse +CONFIGURE_CPU_OPTS+= --disable-sse +endif +ifeq (${ADK_TARGET_CPU_WITH_SSE2},y) +CONFIGURE_CPU_OPTS+= --enable-sse2 +else +CONFIGURE_CPU_OPTS+= --disable-sse2 endif ifeq ($(ADK_DEBUG),y) @@ -89,7 +94,6 @@ CONFIGURE_ARGS:= --prefix=/usr \ --enable-png \ --enable-jpeg \ --enable-mad \ - --disable-faad-internal \ --enable-libvorbis \ --disable-ossaudio \ --disable-vm \ diff --git a/package/mplayer/patches/patch-configure b/package/mplayer/patches/patch-configure deleted file mode 100644 index 0189d6962..000000000 --- a/package/mplayer/patches/patch-configure +++ /dev/null @@ -1,20 +0,0 @@ ---- mplayer-1.0-31868.orig/configure 2010-07-30 17:43:10.000000000 +0200 -+++ mplayer-1.0-31868/configure 2010-10-10 13:06:15.000000000 +0200 -@@ -1530,7 +1530,7 @@ fi - if irix ; then - _ranlib='ar -r' - elif linux ; then -- _ranlib='true' -+ _ranlib='ranlib' - fi - - if win32 ; then -@@ -4354,7 +4354,7 @@ dfb_version() { - - if test "$_directfb" = yes; then - cat > $TMPC << EOF --#include -+#include - int - dfb_ver = DIRECTFB_MAJOR_VERSION.DIRECTFB_MINOR_VERSION.DIRECTFB_MICRO_VERSION - ; diff --git a/package/mplayer/patches/patch-libvo_vo_dga_c b/package/mplayer/patches/patch-libvo_vo_dga_c new file mode 100644 index 000000000..57836218f --- /dev/null +++ b/package/mplayer/patches/patch-libvo_vo_dga_c @@ -0,0 +1,11 @@ +--- mplayer-1.0-32749.orig/libvo/vo_dga.c 2011-01-03 11:26:57.000000000 +0100 ++++ mplayer-1.0-32749/libvo/vo_dga.c 2011-01-03 11:44:50.000000000 +0100 +@@ -35,7 +35,7 @@ + #include "mp_msg.h" + + #include +-#include ++#include + + #ifdef CONFIG_XF86VM + #include -- cgit v1.2.3 From 9d7481f99afcf8289aba23cefb9d23a22fc829cb Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Mon, 3 Jan 2011 17:10:28 +0100 Subject: fix cross-compile on Darwin --- package/nfs-utils/Makefile | 2 +- package/nfs-utils/patches/patch-support_include_sockaddr_h | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/package/nfs-utils/Makefile b/package/nfs-utils/Makefile index fb5a1236d..86c1a9e71 100644 --- a/package/nfs-utils/Makefile +++ b/package/nfs-utils/Makefile @@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= nfs-utils PKG_VERSION:= 1.2.3 -PKG_RELEASE:= 2 +PKG_RELEASE:= 3 PKG_MD5SUM:= 1131dc5f27c4f3905a6e7ee0d594fd4d PKG_DESCR:= Utilities for NFS kernel server implementation PKG_SECTION:= net/fs diff --git a/package/nfs-utils/patches/patch-support_include_sockaddr_h b/package/nfs-utils/patches/patch-support_include_sockaddr_h index 07d9eda46..129b83e5a 100644 --- a/package/nfs-utils/patches/patch-support_include_sockaddr_h +++ b/package/nfs-utils/patches/patch-support_include_sockaddr_h @@ -1,10 +1,11 @@ --- nfs-utils-1.2.3.orig/support/include/sockaddr.h 2010-09-28 14:24:16.000000000 +0200 -+++ nfs-utils-1.2.3/support/include/sockaddr.h 2010-12-25 00:47:43.000000000 +0100 -@@ -20,7 +20,6 @@ ++++ nfs-utils-1.2.3/support/include/sockaddr.h 2011-01-03 12:12:10.000000000 +0100 +@@ -20,7 +20,7 @@ #ifndef NFS_UTILS_SOCKADDR_H #define NFS_UTILS_SOCKADDR_H -#include ++#include #include #include #include -- cgit v1.2.3 From 997830b4badbe43675b8c4f3d8ea7390b1cdf61f Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Mon, 3 Jan 2011 17:11:26 +0100 Subject: add mtrr support, mask some drivers not useful for ibm x40 --- target/config/Config.in | 3 +++ target/linux/config/Config.in.cpu | 5 +++++ target/linux/config/Config.in.graphics | 2 ++ target/linux/config/Config.in.misc | 4 +++- target/linux/config/Config.in.netdevice | 38 ++++++++++++++++++++++++++++----- target/linux/config/Config.in.watchdog | 4 ++++ target/x86/sys-available/ibm-x40 | 3 ++- 7 files changed, 52 insertions(+), 7 deletions(-) diff --git a/target/config/Config.in b/target/config/Config.in index 32884f778..1d112c2da 100644 --- a/target/config/Config.in +++ b/target/config/Config.in @@ -93,6 +93,9 @@ config ADK_NATIVE config ADK_TARGET_CPU_WITH_VT boolean +config ADK_TARGET_CPU_WITH_MTRR + boolean + config ADK_TARGET_CPU_WITH_MMX boolean diff --git a/target/linux/config/Config.in.cpu b/target/linux/config/Config.in.cpu index a145ea217..64d9e9f3f 100644 --- a/target/linux/config/Config.in.cpu +++ b/target/linux/config/Config.in.cpu @@ -6,3 +6,8 @@ config ADK_KERNEL_MPENTIUMM config ADK_KERNEL_MGEODE_LX boolean + +config ADK_KERNEL_MTRR + boolean + default y if ADK_TARGET_CPU_WITH_MTRR + default n diff --git a/target/linux/config/Config.in.graphics b/target/linux/config/Config.in.graphics index c49d0f644..db6dcf36a 100644 --- a/target/linux/config/Config.in.graphics +++ b/target/linux/config/Config.in.graphics @@ -32,6 +32,7 @@ config ADK_KERNEL_FB_GEODE_LX select ADK_KERNEL_FB_GEODE default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX1C default n + depends on ADK_TARGET_SYSTEM_PCENGINES_ALIX1C help Framebuffer support for ALIX boards with VGA. @@ -47,6 +48,7 @@ config ADK_HARDWARE_GRAPHICS_INTEL_I915 select ADK_KERNEL_DRM_I915 default y if ADK_TARGET_SYSTEM_IBM_X40 default n + depends on ADK_TARGET_SYSTEM_IBM_X40 help AGP/DRM/KMS support for Intel chipset i915. diff --git a/target/linux/config/Config.in.misc b/target/linux/config/Config.in.misc index 4ca6883e1..f936f39be 100644 --- a/target/linux/config/Config.in.misc +++ b/target/linux/config/Config.in.misc @@ -32,6 +32,7 @@ config ADK_KERNEL_RTC_DRV_AT91SAM9 select ADK_KERNEL_RTC_INTF_DEV default y if ADK_TARGET_SYSTEM_ACMESYSTEMS_FOXG20 default n + depends on ADK_TARGET_SYSTEM_ACMESYSTEMS_FOXG20 help Fox G20 RTC support. @@ -54,6 +55,7 @@ config ADK_KPACKAGE_KMOD_SCx200_ACB select ADK_KERNEL_I2C select ADK_KERNEL_I2C_CHARDEV default n + depends on ADK_CPU_GEODE help I2C driver for Geode boards. @@ -66,7 +68,7 @@ config ADK_KPACKAGE_KMOD_PARPORT Kernel module for generic parallel port support. config ADK_KPACKAGE_KMOD_PARPORT_PC - prompt "kmod-parport-pc................... PC style parallel port support" + prompt "kmod-parport-pc................. PC style parallel port support" tristate default n depends on ADK_KPACKAGE_KMOD_PARPORT diff --git a/target/linux/config/Config.in.netdevice b/target/linux/config/Config.in.netdevice index c33b10868..40573a78f 100644 --- a/target/linux/config/Config.in.netdevice +++ b/target/linux/config/Config.in.netdevice @@ -1,4 +1,5 @@ menu "Network devices support" +comment "Ethernet network driver for target system is included into kernel" config ADK_KERNEL_NETDEVICES boolean @@ -93,6 +94,35 @@ config ADK_KERNEL_B44 default n help +config ADK_KERNEL_E1000 + boolean + select ADK_KERNEL_NETDEVICES + select ADK_KERNEL_NET_ETHERNET + select ADK_KERNEL_NETDEV_1000 + default y if ADK_TARGET_SYSTEM_IBM_X40 + default y if ADK_TARGET_SYSTEM_QEMU_X86 + default y if ADK_TARGET_SYSTEM_QEMU_X86_64 + default n + help + +config ADK_KERNEL_SKY2 + boolean + select ADK_KERNEL_NETDEVICES + select ADK_KERNEL_NET_ETHERNET + select ADK_KERNEL_NETDEV_1000 + default y if ADK_TARGET_SYSTEM_SHUTTLE_SA76G2 + default n + help + +config ADK_KERNEL_R8169 + boolean + select ADK_KERNEL_NETDEVICES + select ADK_KERNEL_NET_ETHERNET + select ADK_KERNEL_NETDEV_1000 + default y if ADK_TARGET_SYSTEM_OVH_RPS + default n + help + menu "Ethernet card support" depends on ADK_TARGET_WITH_PCI @@ -156,9 +186,7 @@ config ADK_KPACKAGE_KMOD_E1000 select ADK_KERNEL_NETDEVICES select ADK_KERNEL_NET_ETHERNET select ADK_KERNEL_NETDEV_1000 - default y if ADK_TARGET_SYSTEM_IBM_X40 - default y if ADK_TARGET_SYSTEM_QEMU_X86 - default y if ADK_TARGET_SYSTEM_QEMU_X86_64 + depends on !ADK_KERNEL_E1000 default n help This driver supports Intel(R) PRO/1000 gigabit ethernet family of @@ -173,7 +201,7 @@ config ADK_KPACKAGE_KMOD_SKY2 select ADK_KERNEL_NETDEVICES select ADK_KERNEL_NET_ETHERNET select ADK_KERNEL_NETDEV_1000 - default y if ADK_TARGET_SYSTEM_SHUTTLE_SA76G2 + depends on !ADK_KERNEL_SKY2 default n help @@ -183,7 +211,7 @@ config ADK_KPACKAGE_KMOD_R8169 select ADK_KERNEL_NETDEVICES select ADK_KERNEL_NET_ETHERNET select ADK_KERNEL_NETDEV_1000 - default y if ADK_TARGET_SYSTEM_OVH_RPS + depends on !ADK_KERNEL_R8169 default n help diff --git a/target/linux/config/Config.in.watchdog b/target/linux/config/Config.in.watchdog index 914099d0c..69e54e129 100644 --- a/target/linux/config/Config.in.watchdog +++ b/target/linux/config/Config.in.watchdog @@ -22,6 +22,7 @@ config ADK_KERNEL_SCx200_WDT select ADK_KERNEL_SCx200 default y if ADK_TARGET_SYSTEM_PCENGINES_WRAP default n + depends on ADK_TARGET_SYSTEM_PCENGINES_WRAP help Natsemi Watchdog (scx200) @@ -31,6 +32,7 @@ config ADK_KERNEL_AT91SAM9X_WATCHDOG select ADK_KERNEL_WATCHDOG default y if ADK_TARGET_SYSTEM_ACMESYSTEMS_FOXG20 default n + depends on ADK_TARGET_SYSTEM_ACMESYSTEMS_FOXG20 help AT91SAM9X Watchdog. @@ -40,6 +42,7 @@ config ADK_KERNEL_AR7_WDT select ADK_KERNEL_WATCHDOG default y if ADK_TARGET_SYSTEM_LINKSYS_AG241 default n + depends on ADK_TARGET_SYSTEM_LINKSYS_AG241 help AR7 Watchdog. @@ -54,6 +57,7 @@ config ADK_KERNEL_GEODE_WDT default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX2D2 default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX2D13 default n + depends on ADK_CPU_GEODE help Geode watchdog. diff --git a/target/x86/sys-available/ibm-x40 b/target/x86/sys-available/ibm-x40 index 7ad8472bd..ff5edcaa7 100644 --- a/target/x86/sys-available/ibm-x40 +++ b/target/x86/sys-available/ibm-x40 @@ -7,14 +7,15 @@ config ADK_TARGET_SYSTEM_IBM_X40 select ADK_TARGET_CPU_WITH_MMX select ADK_TARGET_CPU_WITH_SSE select ADK_TARGET_CPU_WITH_SSE2 + select ADK_TARGET_CPU_WITH_MTRR select ADK_TARGET_WITH_USB_BOOT select ADK_TARGET_WITH_CARDBUS select ADK_TARGET_WITH_USB - select ADK_TARGET_WITH_PCI select ADK_TARGET_WITH_VGA select ADK_TARGET_WITH_INPUT select ADK_TARGET_WITH_RTC select ADK_TARGET_WITH_CF + select ADK_TARGET_WITH_MINIPCI select ADK_TARGET_WITH_HDD # with docking station select ADK_TARGET_WITH_PP -- cgit v1.2.3 From 1568f63d9bd72111e0742045846f3a33a7f48039 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Mon, 3 Jan 2011 18:16:39 +0100 Subject: make it cross-compile --- package/qemu/Makefile | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/package/qemu/Makefile b/package/qemu/Makefile index 6d5de5bab..1bafddc94 100644 --- a/package/qemu/Makefile +++ b/package/qemu/Makefile @@ -9,6 +9,7 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= 397a0d665da8ba9d3b9583629f3d6421 PKG_DESCR:= cpu and system emulator PKG_SECTION:= misc +PKG_BUILDDEP:= zlib PKG_URL:= http://wwww.qemu.org/ PKG_SITES:= http://wiki.qemu.org/download/ @@ -17,10 +18,16 @@ include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,QEMU,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CONFIG_STYLE:= minimal +CONFIGURE_ARGS+= --host-cc=$(HOSTCC) \ + --cross-prefix=$(TARGET_CROSS) \ + --disable-user \ + --prefix=/usr \ + --sysconfdir=/etc \ + --bindir=/usr/bin post-install: $(INSTALL_DIR) $(IDIR_QEMU)/usr/bin - $(INSTALL_BIN) $(WRKINST)/usr/local/bin/qemu* \ + $(INSTALL_BIN) $(WRKINST)/usr/bin/qemu* \ $(IDIR_QEMU)/usr/bin include ${TOPDIR}/mk/pkg-bottom.mk -- cgit v1.2.3 From d75c4702cc626e744a43aa144e62ad54e775041b Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Mon, 3 Jan 2011 18:17:20 +0100 Subject: avoid error message, when not available --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index d5c583c56..9c08dc134 100644 --- a/Makefile +++ b/Makefile @@ -219,7 +219,7 @@ NO_ERROR=0 @echo 'HOSTCXX:=${CXX}' >>prereq.mk @echo 'HOSTCXXFLAGS:=-O2' >>prereq.mk @echo "HOST_LIBIDL_CONFIG:=$$(which libIDL-config-2 2>/dev/null)" >>prereq.mk - @echo "PKG_HOSTLIB_DIR:=$$(pkg-config --variable pc_path pkg-config)" >>prereq.mk + @echo "PKG_HOSTLIB_DIR:=$$(pkg-config --variable pc_path pkg-config 2>/dev/null)" >>prereq.mk @echo 'LANGUAGE:=C' >>prereq.mk @echo 'LC_ALL:=C' >>prereq.mk @echo 'MAKE:=$${GMAKE}' >>prereq.mk -- cgit v1.2.3