summaryrefslogtreecommitdiff
path: root/package
diff options
context:
space:
mode:
Diffstat (limited to 'package')
-rw-r--r--package/base-files/Makefile2
-rw-r--r--package/base-files/src/lib/mdev/init15
-rw-r--r--package/busybox/Makefile2
-rw-r--r--package/busybox/config/networking/Config.in2
-rw-r--r--package/busybox/config/util-linux/Config.in1
-rw-r--r--package/libtirpc/Makefile2
-rw-r--r--package/libx264/Makefile3
-rw-r--r--package/libx264/patches/patch-Makefile11
-rw-r--r--package/libx264/patches/patch-configure8
-rw-r--r--package/openssl/Makefile5
-rw-r--r--package/realtek-firmware/Makefile27
-rw-r--r--package/watchdog/Makefile4
-rw-r--r--package/xinput_calibrator/Makefile2
13 files changed, 41 insertions, 43 deletions
diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index f1e0d0666..10e914178 100644
--- a/package/base-files/Makefile
+++ b/package/base-files/Makefile
@@ -6,7 +6,7 @@ include $(TOPDIR)/mk/rootfs.mk
PKG_NAME:= base-files
PKG_VERSION:= 1.0
-PKG_RELEASE:= 63
+PKG_RELEASE:= 64
PKG_SECTION:= base
PKG_DESCR:= basic files and scripts
PKG_BUILDDEP:= pkgconf-host file-host
diff --git a/package/base-files/src/lib/mdev/init b/package/base-files/src/lib/mdev/init
index f2b7125b8..a478abecd 100644
--- a/package/base-files/src/lib/mdev/init
+++ b/package/base-files/src/lib/mdev/init
@@ -1,19 +1,4 @@
#!/bin/sh
-if [ "$SUBSYSTEM" == "firmware" ];then
- logger "Firmware load for $FIRMWARE requested"
- if [ "$ACTION" == "add" ];then
- if [ -e "/lib/firmware/$FIRMWARE" ];then
- logger "Firmware loading ..."
- echo 1 > /sys$DEVPATH/loading
- cat "/lib/firmware/$FIRMWARE" > /sys$DEVPATH/data
- echo 0 > /sys$DEVPATH/loading
- logger "finished."
- else
- logger "Firmware file $FIRMWARE not found"
- echo -1 > /sys$DEVPATH/loading
- fi
- fi
-fi
if [ "$SUBSYSTEM" == "pcmcia_socket" ];then
logger "Setting up PCMCIA socket resource database"
if [ "$ACTION" == "add" ];then
diff --git a/package/busybox/Makefile b/package/busybox/Makefile
index 0cde4bca5..1d50365e3 100644
--- a/package/busybox/Makefile
+++ b/package/busybox/Makefile
@@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:= busybox
PKG_VERSION:= 1.21.1
-PKG_RELEASE:= 2
+PKG_RELEASE:= 3
PKG_MD5SUM:= 795394f83903b5eec6567d51eebb417e
PKG_DESCR:= core utilities for embedded systems
PKG_SECTION:= base
diff --git a/package/busybox/config/networking/Config.in b/package/busybox/config/networking/Config.in
index 74069af13..e350a1b16 100644
--- a/package/busybox/config/networking/Config.in
+++ b/package/busybox/config/networking/Config.in
@@ -1017,7 +1017,7 @@ source package/busybox/config/networking/udhcp/Config.in
config BUSYBOX_IFUPDOWN_UDHCPC_CMD_OPTIONS
string "ifup udhcpc command line options"
- default "-R -n"
+ default "-R -b"
depends on BUSYBOX_IFUPDOWN && BUSYBOX_UDHCPC
help
Command line options to pass to udhcpc from ifup.
diff --git a/package/busybox/config/util-linux/Config.in b/package/busybox/config/util-linux/Config.in
index baf6beb26..aafc795b1 100644
--- a/package/busybox/config/util-linux/Config.in
+++ b/package/busybox/config/util-linux/Config.in
@@ -69,6 +69,7 @@ config BUSYBOX_FEATURE_MDEV_LOAD_FIRMWARE
These devices will request userspace look up the files in
/lib/firmware/ and if it exists, send it to the kernel for
loading into the hardware.
+
config BUSYBOX_REV
bool "rev"
default n
diff --git a/package/libtirpc/Makefile b/package/libtirpc/Makefile
index bda186efb..84f85a703 100644
--- a/package/libtirpc/Makefile
+++ b/package/libtirpc/Makefile
@@ -13,7 +13,7 @@ PKG_DEPENDS:= libgssglue
PKG_BUILDDEP:= libgssglue
PKG_URL:= http://sourceforge.net/projects/libtirpc/
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=libtirpc/}
-PKG_OPTS: dev
+PKG_OPTS:= dev
PKG_LIBC_DEPENDS:= uclibc eglibc glibc
diff --git a/package/libx264/Makefile b/package/libx264/Makefile
index 55bd18868..0fce6390e 100644
--- a/package/libx264/Makefile
+++ b/package/libx264/Makefile
@@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:= libx264
# actually is git checkout from 22.01.2014
PKG_VERSION:= 1.0.1
-PKG_RELEASE:= 2
+PKG_RELEASE:= 3
PKG_MD5SUM:= 6be3e8adeaf6b007bbc04026b6ebd304
PKG_DESCR:= H264 encoding library
PKG_SECTION:= libs
@@ -24,6 +24,7 @@ ifeq ($(ADK_TARGET_SYSTEM_SHARP_ZAURUS),y)
CONFIGURE_ARGS+= --disable-asm
endif
CONFIGURE_ARGS+= --disable-cli \
+ --enable-asm \
--cross-prefix=$(TARGET_CROSS)
libx264-install:
diff --git a/package/libx264/patches/patch-Makefile b/package/libx264/patches/patch-Makefile
deleted file mode 100644
index cd8a9f198..000000000
--- a/package/libx264/patches/patch-Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- libx264-1.0.1.orig/Makefile 2014-01-22 11:20:21.000000000 +0100
-+++ libx264-1.0.1/Makefile 2014-01-22 11:26:46.000000000 +0100
-@@ -117,7 +117,7 @@ endif
-
- # NEON optims
- ifeq ($(ARCH),ARM)
--ifneq ($(AS),)
-+ifneq ($(ASM),no)
- ASMSRC += common/arm/cpu-a.S common/arm/pixel-a.S common/arm/mc-a.S \
- common/arm/dct-a.S common/arm/quant-a.S common/arm/deblock-a.S \
- common/arm/predict-a.S
diff --git a/package/libx264/patches/patch-configure b/package/libx264/patches/patch-configure
index ed9d2ed94..09b9f1fff 100644
--- a/package/libx264/patches/patch-configure
+++ b/package/libx264/patches/patch-configure
@@ -21,11 +21,3 @@
fi
if cc_check '' -fno-tree-vectorize ; then
-@@ -1147,6 +1147,7 @@ bindir=$bindir
- libdir=$libdir
- includedir=$includedir
- ARCH=$ARCH
-+ASM=$asm
- SYS=$SYS
- CC=$CC
- CFLAGS=$CFLAGS
diff --git a/package/openssl/Makefile b/package/openssl/Makefile
index a41525ded..3065611c0 100644
--- a/package/openssl/Makefile
+++ b/package/openssl/Makefile
@@ -46,9 +46,10 @@ OPENSSL_OPTIONS+= -DHAVE_CRYPTODEV -DUSE_CRYPTODEV_DIGESTS
endif
ifeq ($(ADK_LINUX_X86_64),y)
-CONFIG:= linux-embedded-x86_64
+CONFIG:= linux-embedded-x86_64
+TARGET_CFLAGS:= $(subst g3,g,$(TARGET_CFLAGS))
else
-CONFIG:= linux-embedded
+CONFIG:= linux-embedded
endif
post-extract:
diff --git a/package/realtek-firmware/Makefile b/package/realtek-firmware/Makefile
new file mode 100644
index 000000000..368a4cf89
--- /dev/null
+++ b/package/realtek-firmware/Makefile
@@ -0,0 +1,27 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include ${TOPDIR}/rules.mk
+
+PKG_NAME:= realtek-firmware
+PKG_VERSION:= 1.0
+PKG_RELEASE:= 1
+PKG_MD5SUM:= 85a7d1d1386143fad312a5a82c422380
+PKG_DESCR:= firmware for realtek wireless cards
+PKG_SECTION:= wifi
+PKG_SITES:= http://www.openadk.org/distfiles/
+
+include ${TOPDIR}/mk/package.mk
+
+$(eval $(call PKG_template,REALTEK_FIRMWARE,realtek-firmware,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+
+CONFIG_STYLE:= manual
+BUILD_STYLE:= manual
+INSTALL_STYLE:= manual
+
+do-install:
+ ${INSTALL_DIR} ${IDIR_REALTEK_FIRMWARE}/lib/firmware/rtlwifi
+ ${CP} ${WRKBUILD}/*.bin \
+ ${IDIR_REALTEK_FIRMWARE}/lib/firmware/rtlwifi
+
+include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/watchdog/Makefile b/package/watchdog/Makefile
index 2f67c4012..df586c8c0 100644
--- a/package/watchdog/Makefile
+++ b/package/watchdog/Makefile
@@ -5,10 +5,12 @@ include ${TOPDIR}/rules.mk
PKG_NAME:= watchdog
PKG_VERSION:= 5.7
-PKG_RELEASE:= 2
+PKG_RELEASE:= 3
PKG_MD5SUM:= 31766450ecfc9aff70fe966c0b9df06d
PKG_DESCR:= watchdog daemon
PKG_SECTION:= utils
+PKG_DEPENDS:= libtirpc
+PKG_BUILDDEP:= libtirpc
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=watchdog/}
include ${TOPDIR}/mk/package.mk
diff --git a/package/xinput_calibrator/Makefile b/package/xinput_calibrator/Makefile
index 14785c271..e4db834c3 100644
--- a/package/xinput_calibrator/Makefile
+++ b/package/xinput_calibrator/Makefile
@@ -10,7 +10,7 @@ PKG_MD5SUM:= 20da0a2055a5a75962add8c6b44f60fa
PKG_DESCR:= X11 input calibration utility
PKG_SECTION:= x11/apps
PKG_DEPENDS:= libstdcxx
-PKG_URL:= https://github.com/tias/xinput_calibrator
+PKG_URL:= http://github.com/downloads/tias/xinput_calibrator/
PKG_SITES:= http://openadk.org/distfiles/
include $(TOPDIR)/mk/package.mk