summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--mk/vars.mk2
-rw-r--r--package/busybox/config/util-linux/Config.in4
-rw-r--r--package/firefox/Makefile1
-rw-r--r--package/gmediaserver/Makefile2
-rw-r--r--package/pciutils/Makefile8
-rw-r--r--package/uclibc++/Makefile1
-rw-r--r--package/usbutils/Makefile6
-rw-r--r--target/linux/config/Config.in.misc7
-rw-r--r--target/linux/config/Config.in.usb40
-rw-r--r--target/packages/pkg-available/laptop8
-rw-r--r--tools/adk/Makefile16
-rw-r--r--tools/cpio/Makefile6
-rw-r--r--tools/mkcrypt/Makefile6
13 files changed, 48 insertions, 59 deletions
diff --git a/mk/vars.mk b/mk/vars.mk
index b7ec813b4..300e41aae 100644
--- a/mk/vars.mk
+++ b/mk/vars.mk
@@ -89,7 +89,7 @@ endif
# A nifty macro to make testing gcc features easier (from uClibc project)
check_gcc=$(shell \
- if $(CC) $(1) -S -o /dev/null -xc /dev/null > /dev/null 2>&1; \
+ if $(CC_FOR_BUILD) $(1) -S -o /dev/null -xc /dev/null > /dev/null 2>&1; \
then echo "$(1)"; else echo "$(2)"; fi)
CF_FOR_BUILD=$(call check_gcc,-fhonour-copts,)
diff --git a/package/busybox/config/util-linux/Config.in b/package/busybox/config/util-linux/Config.in
index 5462ee98a..8e78e2e27 100644
--- a/package/busybox/config/util-linux/Config.in
+++ b/package/busybox/config/util-linux/Config.in
@@ -358,7 +358,7 @@ config BUSYBOX_LOSETUP
config BUSYBOX_LSPCI
bool "lspci"
- default y
+ default n
depends on !ADK_PACKAGE_PCIUTILS
help
lspci is a utility for displaying information about PCI buses in the
@@ -368,7 +368,7 @@ config BUSYBOX_LSPCI
config BUSYBOX_LSUSB
bool "lsusb"
- default y
+ default n
depends on !ADK_PACKAGE_LSUSB
help
lsusb is a utility for displaying information about USB buses in the
diff --git a/package/firefox/Makefile b/package/firefox/Makefile
index 895a2c76a..d9cf25c20 100644
--- a/package/firefox/Makefile
+++ b/package/firefox/Makefile
@@ -16,6 +16,7 @@ PKG_BUILDDEP:= alsa-lib dbus-glib glib gtk+ libnotify libIDL libX11
PKG_BUILDDEP+= nspr nss jpeg libXt fontconfig sqlite
PKG_URL:= http://www.mozilla.org/
PKG_SITES:= http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${PKG_VERSION}/source/
+PKG_NOPARALLEL:= 1
PKG_ARCH_DEPENDS:= x86 x86_64 mips mipsel mips64 mips64el
PKG_HOST_DEPENDS:= !netbsd !freebsd !openbsd !cygwin
diff --git a/package/gmediaserver/Makefile b/package/gmediaserver/Makefile
index 5fee99c45..7f82212fc 100644
--- a/package/gmediaserver/Makefile
+++ b/package/gmediaserver/Makefile
@@ -10,7 +10,7 @@ PKG_MD5SUM:= c422de386331e2a1a859d45f6fa270a3
PKG_DESCR:= An UPnP music media server
PKG_SECTION:= multimedia
PKG_DEPENDS:= id3lib libupnp
-PKG_BUILDDEP:= id3lib libupnp
+PKG_BUILDDEP:= id3lib libupnp file
PKG_URL:= http://www.gnu.org/software/gmediaserver
PKG_SITES:= http://savannah.nongnu.org/download/gmediaserver/
diff --git a/package/pciutils/Makefile b/package/pciutils/Makefile
index e1176564d..802dc0bb5 100644
--- a/package/pciutils/Makefile
+++ b/package/pciutils/Makefile
@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
PKG_NAME:= pciutils
PKG_VERSION:= 3.1.7
-PKG_RELEASE:= 2
+PKG_RELEASE:= 3
PKG_MD5SUM:= f3e349d22a3714b4272b171649ad5235
PKG_DESCR:= PCI Utilities
PKG_SECTION:= utils
@@ -29,8 +29,8 @@ MAKE_FLAGS+= CC="${TARGET_CC}" \
ALL_TARGET:=
do-install:
- ${INSTALL_DIR} ${IDIR_PCIUTILS}/usr/{share,sbin}
- ${INSTALL_BIN} ${WRKBUILD}/{lspci,setpci} ${IDIR_PCIUTILS}/usr/sbin/
- ${INSTALL_DATA} ${WRKBUILD}/pci.ids ${IDIR_PCIUTILS}/usr/share/
+ ${INSTALL_DIR} ${IDIR_PCIUTILS}/usr/{share,bin}
+ ${INSTALL_BIN} ${WRKBUILD}/{lspci,setpci} ${IDIR_PCIUTILS}/usr/bin
+ ${INSTALL_DATA} ${WRKBUILD}/pci.ids ${IDIR_PCIUTILS}/usr/share
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/uclibc++/Makefile b/package/uclibc++/Makefile
index e718b20bc..ff18a3838 100644
--- a/package/uclibc++/Makefile
+++ b/package/uclibc++/Makefile
@@ -12,6 +12,7 @@ PKG_SECTION:= libs
PKG_URL:= http://cxx.uclibc.org/
PKG_SITES:= http://cxx.uclibc.org/src/
PKG_NEED_CXX:= 1
+PKG_NOPARALLEL:= 1
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2
diff --git a/package/usbutils/Makefile b/package/usbutils/Makefile
index 21ec416ed..2aae6b570 100644
--- a/package/usbutils/Makefile
+++ b/package/usbutils/Makefile
@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
PKG_NAME:= usbutils
PKG_VERSION:= 0.86
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_MD5SUM:= 34979f675d2bcb3e1b45012fa830a53f
PKG_DESCR:= A program to list USB devices
PKG_SECTION:= utils
@@ -23,7 +23,7 @@ post-install:
${INSTALL_DIR} ${IDIR_LSUSB}/usr/share
${INSTALL_DATA} ${WRKINST}/usr/share/usb.ids \
${IDIR_LSUSB}/usr/share/
- ${INSTALL_DIR} ${IDIR_LSUSB}/usr/sbin
- ${INSTALL_BIN} ${WRKINST}/usr/sbin/lsusb ${IDIR_LSUSB}/usr/sbin/
+ ${INSTALL_DIR} ${IDIR_LSUSB}/usr/bin
+ ${INSTALL_BIN} ${WRKINST}/usr/sbin/lsusb ${IDIR_LSUSB}/usr/bin
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/target/linux/config/Config.in.misc b/target/linux/config/Config.in.misc
index f936f39be..8acd0dabe 100644
--- a/target/linux/config/Config.in.misc
+++ b/target/linux/config/Config.in.misc
@@ -1,9 +1,3 @@
-#config ADK_LINUX_INITRAMFS_BUILTIN
-# select ADK_KERNEL_BLK_DEV_INITRD
-# select ADK_KERNEL_INITRAMFS_COMPRESSION_NONE
-# boolean
-# default n
-
config ADK_KERNEL_RFKILL
boolean
@@ -46,6 +40,7 @@ config ADK_KERNEL_RTC_DRV_CMOS
default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX2D13
default y if ADK_TARGET_SYSTEM_IBM_X40
default n
+ depends on (ADK_TARGET_SYSTEM_PCENGINES_ALIX1C || ADK_TARGET_SYSTEM_PCENGINES_ALIX2D13 || ADK_TARGET_SYSTEM_IBM_X40)
help
PC CMOS RTC support.
diff --git a/target/linux/config/Config.in.usb b/target/linux/config/Config.in.usb
index 07a97ae24..52eb92864 100644
--- a/target/linux/config/Config.in.usb
+++ b/target/linux/config/Config.in.usb
@@ -1,35 +1,37 @@
menu "USB support"
depends on ADK_TARGET_WITH_USB
+config ADK_KERNEL_USB
+ boolean
+
config ADK_KERNEL_USB_LIBUSUAL
tristate
config ADK_KERNEL_USB_SERIAL
boolean
-config ADK_KERNEL_USB
- boolean
-
config ADK_KERNEL_USB_STORAGE
boolean
config ADK_KERNEL_USB_EHCI_HCD
boolean
+ select ADK_PACKAGE_KMOD_USB_CONTROLLER
config ADK_KERNEL_USB_UHCI_HCD
boolean
+ select ADK_PACKAGE_KMOD_USB_CONTROLLER
config ADK_KPACKAGE_KMOD_USB
prompt "kmod-usb......................... USB support"
tristate
+ select ADK_KERNEL_NLS
+ depends on !ADK_KERNEL_USB
default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX1C
default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX2D2
default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX2D13
default y if ADK_TARGET_SYSTEM_IBM_X40
default y if ADK_TARGET_SYSTEM_ACMESYSTEMS_FOXG20
default n
- depends on !ADK_KERNEL_USB
- select ADK_KERNEL_NLS
help
Universal Serial Bus (USB) is a specification for a serial bus
subsystem which offers higher speeds and more features than the
@@ -62,10 +64,12 @@ config ADK_KPACKAGE_KMOD_USB
config ADK_KPACKAGE_KMOD_USB_UHCI_HCD
prompt "kmod-usb-uhci................... Support for UHCI controllers"
tristate
+ select ADK_PACKAGE_KMOD_USB_CONTROLLER
depends on ADK_KPACKAGE_KMOD_USB
depends on !ADK_KERNEL_USB_UHCI_HCD
depends on !ADK_TARGET_SYSTEM_ACMESYSTEMS_FOXG20
- select ADK_PACKAGE_KMOD_USB_CONTROLLER
+ default y if ADK_TARGET_SYSTEM_IBM_X40
+ default n
help
The Universal Host Controller Interface is a standard by Intel for
accessing the USB hardware in the PC (which is also called the USB
@@ -79,15 +83,13 @@ config ADK_KPACKAGE_KMOD_USB_UHCI_HCD
config ADK_KPACKAGE_KMOD_USB_OHCI_HCD
prompt "kmod-usb-ohci................... Support for OHCI controllers"
tristate
+ select ADK_PACKAGE_KMOD_USB_CONTROLLER
+ depends on ADK_KPACKAGE_KMOD_USB
+ depends on !ADK_TARGET_SYSTEM_ACMESYSTEMS_FOXG20
default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX1C
default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX2D2
default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX2D13
- default y if ADK_TARGET_SYSTEM_ACMESYSTEMS_FOXG20
- default y if ADK_TARGET_SYSTEM_IBM_X40
default n
- depends on ADK_KPACKAGE_KMOD_USB
- depends on !ADK_TARGET_SYSTEM_ACMESYSTEMS_FOXG20
- select ADK_PACKAGE_KMOD_USB_CONTROLLER
help
The Open Host Controller Interface (OHCI) is a standard for accessing
USB 1.1 host controller hardware. It does more in hardware than Intel's
@@ -101,10 +103,10 @@ config ADK_KPACKAGE_KMOD_USB_OHCI_HCD
config ADK_KPACKAGE_KMOD_USB_ISP116X_HCD
prompt "kmod-usb-isp116x................ ISP116X HCD support"
tristate
- default n
+ select ADK_PACKAGE_KMOD_USB_CONTROLLER
depends on ADK_KPACKAGE_KMOD_USB
depends on !ADK_TARGET_SYSTEM_ACMESYSTEMS_FOXG20
- select ADK_PACKAGE_KMOD_USB_CONTROLLER
+ default n
help
The ISP1160 and ISP1161 chips are USB host controllers. Enable this
option if your board has this chip. If unsure, say N.
@@ -114,10 +116,10 @@ config ADK_KPACKAGE_KMOD_USB_ISP116X_HCD
config ADK_KPACKAGE_KMOD_USB_SL811_HCD
prompt "kmod-usb-sl811.................. SL811HS HCD support"
tristate
- default n
+ select ADK_PACKAGE_KMOD_USB_CONTROLLER
depends on ADK_KPACKAGE_KMOD_USB
depends on !ADK_TARGET_SYSTEM_ACMESYSTEMS_FOXG20
- select ADK_PACKAGE_KMOD_USB_CONTROLLER
+ default n
help
The SL811HS is a single-port USB controller that supports either
host side or peripheral side roles. Enable this option if your
@@ -128,15 +130,15 @@ config ADK_KPACKAGE_KMOD_USB_SL811_HCD
config ADK_KPACKAGE_KMOD_USB_EHCI_HCD
prompt "kmod-usb-ehci................... Support for USB 2.0 controllers"
tristate
+ select ADK_PACKAGE_KMOD_USB_CONTROLLER
depends on !ADK_KERNEL_USB_EHCI_HCD
+ depends on !ADK_TARGET_SYSTEM_ACMESYSTEMS_FOXG20
+ depends on ADK_KPACKAGE_KMOD_USB
default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX1C
default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX2D2
default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX2D13
default y if ADK_TARGET_SYSTEM_IBM_X40
default n
- depends on !ADK_TARGET_SYSTEM_ACMESYSTEMS_FOXG20
- depends on ADK_KPACKAGE_KMOD_USB
- select ADK_PACKAGE_KMOD_USB_CONTROLLER
help
The Enhanced Host Controller Interface (EHCI) is standard for USB 2.0
"high speed" (480 Mbit/sec, 60 Mbyte/sec) host controller hardware.
@@ -158,7 +160,7 @@ config ADK_KPACKAGE_KMOD_USB_EHCI_HCD
config ADK_PACKAGE_KMOD_USB_CONTROLLER
tristate
- depends on ADK_KPACKAGE_KMOD_USB_UHCI_HCD || ADK_KPACKAGE_KMOD_USB_OHCI_HCD || ADK_KPACKAGE_KMOD_EHCI_HCD
+ default y if ADK_TARGET_SYSTEM_ACMESYSTEMS_FOXG20
default n
config ADK_KPACKAGE_KMOD_USB_ACM
diff --git a/target/packages/pkg-available/laptop b/target/packages/pkg-available/laptop
index 1d0185550..9663690fe 100644
--- a/target/packages/pkg-available/laptop
+++ b/target/packages/pkg-available/laptop
@@ -1,19 +1,11 @@
config ADK_PKG_LAPTOP
bool "Choose packages for a laptop system with X"
default n
- select ADK_KPACKAGE_KMOD_PCMCIA
- select ADK_KPACKAGE_KMOD_PCCARD
- select ADK_KPACKAGE_KMOD_SERIAL_8250_CS
select ADK_PACKAGE_SCREEN
select ADK_PACKAGE_VIM
select ADK_PACKAGE_SUDO
select ADK_PACKAGE_KEYCHAIN
- select ADK_PACKAGE_CRYPTSETUP
- select ADK_PACKAGE_OPENSC
- select ADK_PACKAGE_PCSC_LITE
- select ADK_PACKAGE_CCID
select ADK_PACKAGE_ALSA_UTILS
- select ADK_PACKAGE_OPENSSL_PKCS11
select ADK_PACKAGE_OPENSSH_CLIENT
select ADK_PACKAGE_OPENSSH_CLIENT_UTILS
select ADK_PACKAGE_OPENSSH_SERVER
diff --git a/tools/adk/Makefile b/tools/adk/Makefile
index 638935e5e..e3c9aceed 100644
--- a/tools/adk/Makefile
+++ b/tools/adk/Makefile
@@ -3,17 +3,15 @@
include $(TOPDIR)/rules.mk
-CCANDLD.c= ${HOSTCC} ${HOSTCFLAGS} ${HOSTCPPFLAGS} ${HOSTLDFLAGS}
-
-${TOOLS_DIR}/depmaker:
- ${CCANDLD.c} -Wall -o $@ depmaker.c
+install: ${TOOLS_DIR}/depmaker ${TOOLS_DIR}/pkgrebuild ${TOOLS_DIR}/dkgetsz
-${TOOLS_DIR}/pkgrebuild:
- ${CCANDLD.c} -Wall -o $@ pkgrebuild.c strmap.c
+${TOOLS_DIR}/depmaker: depmaker.c
+ ${CC_FOR_BUILD} ${FLAGS_FOR_BUILD} -o $@ depmaker.c
-${TOOLS_DIR}/dkgetsz:
- ${CCANDLD.c} -Wall -o $@ dkgetsz.c
+${TOOLS_DIR}/pkgrebuild: pkgrebuild.c strmap.c
+ ${CC_FOR_BUILD} ${FLAGS_FOR_BUILD} -o $@ pkgrebuild.c strmap.c
-install: ${TOOLS_DIR}/depmaker ${TOOLS_DIR}/pkgrebuild ${TOOLS_DIR}/dkgetsz
+${TOOLS_DIR}/dkgetsz: dkgetsz.c
+ ${CC_FOR_BUILD} ${FLAGS_FOR_BUILD} -o $@ dkgetsz.c
include $(TOPDIR)/mk/tools.mk
diff --git a/tools/cpio/Makefile b/tools/cpio/Makefile
index a012c43a5..2280b1ffb 100644
--- a/tools/cpio/Makefile
+++ b/tools/cpio/Makefile
@@ -3,6 +3,8 @@
include $(TOPDIR)/rules.mk
+install: ${TOOLS_DIR}/cpio
+
SRCS+= \
src/ib_open.c \
src/ib_close.c \
@@ -28,8 +30,6 @@ SRCS+= \
src/cpio.c
${TOOLS_DIR}/cpio: ${SRCS}
- ${HOSTCC} ${HOSTCFLAGS} -D_GNU_SOURCE -Isrc -o $@ $^
-
-install: ${TOOLS_DIR}/cpio
+ ${CC_FOR_BUILD} ${FLAGS_FOR_BUILD} -D_GNU_SOURCE -Isrc -o $@ $^
include $(TOPDIR)/mk/tools.mk
diff --git a/tools/mkcrypt/Makefile b/tools/mkcrypt/Makefile
index 1708f9f13..983d9d423 100644
--- a/tools/mkcrypt/Makefile
+++ b/tools/mkcrypt/Makefile
@@ -3,9 +3,9 @@
include $(TOPDIR)/rules.mk
-${TOOLS_DIR}/mkcrypt:
- $(HOSTCC) ${HOSTCFLAGS} -o $@ mkcrypt.c
-
install: ${TOOLS_DIR}/mkcrypt
+${TOOLS_DIR}/mkcrypt:
+ $(CC_FOR_BUILD) ${FLAGS_FOR_BUILD} -o $@ mkcrypt.c
+
include $(TOPDIR)/mk/tools.mk
generated by cgit v1.2.3 (git 2.25.1) at 2025-03-02 09:19:39 +0000