diff options
Diffstat (limited to 'package')
| -rw-r--r-- | package/alsa-lib/patches/patch-src_pcm_pcm_shm_c | 23 | ||||
| -rw-r--r-- | package/busybox/Makefile | 8 | ||||
| -rw-r--r-- | package/busybox/patches/003-fdisk-mmc.patch | 14 |
3 files changed, 28 insertions, 17 deletions
diff --git a/package/alsa-lib/patches/patch-src_pcm_pcm_shm_c b/package/alsa-lib/patches/patch-src_pcm_pcm_shm_c new file mode 100644 index 000000000..decd44bc8 --- /dev/null +++ b/package/alsa-lib/patches/patch-src_pcm_pcm_shm_c @@ -0,0 +1,23 @@ +--- alsa-lib-1.0.22.orig/src/pcm/pcm_shm.c 2009-12-16 16:18:51.000000000 +0100 ++++ alsa-lib-1.0.22/src/pcm/pcm_shm.c 2010-04-04 10:53:44.000000000 +0200 +@@ -482,15 +482,19 @@ static int snd_pcm_shm_drop(snd_pcm_t *p + + static int snd_pcm_shm_drain(snd_pcm_t *pcm) + { ++ struct timespec ts; + snd_pcm_shm_t *shm = pcm->private_data; + volatile snd_pcm_shm_ctrl_t *ctrl = shm->ctrl; + int err; ++ ts.tv_sec = 0; ++ ts.tv_nsec = 10000000; ++ + do { + ctrl->cmd = SNDRV_PCM_IOCTL_DRAIN; + err = snd_pcm_shm_action(pcm); + if (err != -EAGAIN) + break; +- usleep(10000); ++ nanosleep(&ts, NULL); + } while (1); + if (err < 0) + return err; diff --git a/package/busybox/Makefile b/package/busybox/Makefile index 400be01e6..fa2dad9c6 100644 --- a/package/busybox/Makefile +++ b/package/busybox/Makefile @@ -4,14 +4,16 @@ include $(TOPDIR)/rules.mk PKG_NAME:= busybox -PKG_VERSION:= 1.15.2 -PKG_RELEASE:= 4 -PKG_MD5SUM:= 495e320537f0772125f2db3c098e437c +PKG_VERSION:= 1.16.1 +PKG_RELEASE:= 1 +PKG_MD5SUM:= 319486ec65078d07fde26eb620fecde7 PKG_DESCR:= Core utilities for embedded Linux systems PKG_SECTION:= base PKG_URL:= http://www.busybox.net PKG_SITES:= http://www.busybox.net/downloads/ +DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 + include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,BUSYBOX,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) diff --git a/package/busybox/patches/003-fdisk-mmc.patch b/package/busybox/patches/003-fdisk-mmc.patch deleted file mode 100644 index 961c117b2..000000000 --- a/package/busybox/patches/003-fdisk-mmc.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -Nur busybox-1.15.2.orig/util-linux/fdisk.c busybox-1.15.2/util-linux/fdisk.c ---- busybox-1.15.2.orig/util-linux/fdisk.c 2009-10-08 03:04:40.000000000 +0200 -+++ busybox-1.15.2/util-linux/fdisk.c 2010-02-23 20:41:01.000000000 +0100 -@@ -2770,7 +2770,9 @@ - for (s = ptname; *s; s++) - continue; - if (isdigit(s[-1])) -- continue; -+ if (s[-1] != '0') -+ continue; -+ - sprintf(devname, "/dev/%s", ptname); - open_list_and_close(devname, 0); - } |