From f9dbebde256ec6c5bdcd5ec9318d5a312ae62198 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sat, 27 Jun 2009 23:05:23 +0200 Subject: update packages, fix rb532 ext2 rootfs - update alsa, asterisk and nfs-utils - fix ext2fs rootfs on rb532 --- package/alsa-lib/Makefile | 6 +++--- package/alsa-utils/Makefile | 8 ++++---- .../alsa-utils/patches/patch-alsactl_init_parse_c | 21 --------------------- package/asterisk/Makefile | 12 +++++------- package/nfs-utils/Makefile | 4 ++-- target/Config.in | 2 ++ target/linux/config/Config.in.block | 4 ++++ target/rb532/Makefile | 5 ++++- target/rb532/kernel.config | 2 +- 9 files changed, 25 insertions(+), 39 deletions(-) delete mode 100644 package/alsa-utils/patches/patch-alsactl_init_parse_c diff --git a/package/alsa-lib/Makefile b/package/alsa-lib/Makefile index c4ce43379..01f97a8b8 100644 --- a/package/alsa-lib/Makefile +++ b/package/alsa-lib/Makefile @@ -4,9 +4,9 @@ include ${TOPDIR}/rules.mk PKG_NAME:= alsa-lib -PKG_VERSION:= 1.0.19 +PKG_VERSION:= 1.0.20 PKG_RELEASE:= 1 -PKG_MD5SUM:= 73db3666c211e5fb023bb77450cf430d +PKG_MD5SUM:= 6e9080ba1faa5d3739d14dd76c62d8dc PKG_DESCR:= ALSA sound library PKG_SECTION:= libs PKG_URL:= http://www.alsa-project.org @@ -22,7 +22,7 @@ $(eval $(call PKG_template,ALSA_LIB,alsa-lib,${PKG_VERSION}-${PKG_RELEASE},${PKG CONFIGURE_STYLE= gnu CONFIGURE_ARGS+= --disable-python BUILD_STYLE= auto -INSTALL_STYLE= auto confprog +INSTALL_STYLE= auto post-install: ${INSTALL_DIR} ${IDIR_ALSA_LIB}/usr/lib ${IDIR_ALSA_LIB}/usr/share/alsa diff --git a/package/alsa-utils/Makefile b/package/alsa-utils/Makefile index 08fc5f949..1b0dc7eee 100644 --- a/package/alsa-utils/Makefile +++ b/package/alsa-utils/Makefile @@ -4,9 +4,9 @@ include ${TOPDIR}/rules.mk PKG_NAME:= alsa-utils -PKG_VERSION:= 1.0.19 -PKG_RELEASE:= 2 -PKG_MD5SUM:= 5ff0379c707c1a29083233edc9ab4e06 +PKG_VERSION:= 1.0.20 +PKG_RELEASE:= 1 +PKG_MD5SUM:= 6837e673ef19da96d8bd2f9e18cd9574 PKG_DESCR:= ALSA mixer utility PKG_SECTION:= libs PKG_URL:= http://www.alsa-project.org @@ -17,7 +17,7 @@ DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,ALSA_UTILS,alsa-utils,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,ALSA_UTILS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CONFIGURE_STYLE= gnu CONFIGURE_ARGS+= --disable-alsamixer diff --git a/package/alsa-utils/patches/patch-alsactl_init_parse_c b/package/alsa-utils/patches/patch-alsactl_init_parse_c deleted file mode 100644 index fca7eedd9..000000000 --- a/package/alsa-utils/patches/patch-alsactl_init_parse_c +++ /dev/null @@ -1,21 +0,0 @@ -$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- alsa-utils-1.0.19.orig/alsactl/init_parse.c 2009-01-19 12:17:19.000000000 +0100 -+++ alsa-utils-1.0.19/alsactl/init_parse.c 2009-05-09 04:56:45.000000000 +0200 -@@ -381,7 +381,7 @@ static int set_ctl_value(struct space *s - snd_ctl_elem_value_set_integer(space->ctl_value, idx, val); - } else if (items > 2 && value[items-2] == 'd' && value[items-1] == 'B') { - val = strtol(value, NULL, 0) * 100; -- if ((pos2 = index(value, '.')) != NULL) { -+ if ((pos2 = strchr(value, '.')) != NULL) { - if (isdigit(*(pos2-1)) && isdigit(*(pos2-2))) { - if (val < 0) - val -= strtol(pos2 + 1, NULL, 0); -@@ -1253,7 +1253,7 @@ static char *new_root_dir(const char *fi - - res = strdup(filename); - if (res) { -- tmp = rindex(res, '/'); -+ tmp = strrchr(res, '/'); - if (tmp) - *tmp = '\0'; - } diff --git a/package/asterisk/Makefile b/package/asterisk/Makefile index 2a82737d9..e5d428ed5 100644 --- a/package/asterisk/Makefile +++ b/package/asterisk/Makefile @@ -4,9 +4,9 @@ include $(TOPDIR)/rules.mk PKG_NAME:= asterisk -PKG_VERSION:= 1.4.24.1 +PKG_VERSION:= 1.4.25.1 PKG_RELEASE:= 1 -PKG_MD5SUM:= 2b74744350f420b3a94d5323c489426f +PKG_MD5SUM:= 1b42210127d6622c90fc5338de2b4aa9 PKG_DESCR:= Open Source PBX PKG_SECTION:= net PKG_DEPENDS:= libncurses libpthread @@ -122,12 +122,10 @@ pre-configure: post-build: cd ${WRKBUILD}/sounds ; \ - tar xzf asterisk-core-sounds-en-gsm-1.4.14.tar.gz ; \ - rm asterisk-core-sounds-en-gsm-1.4.9.tar.gz ; \ - tar xzf asterisk-moh-freeplay-wav.tar.gz ; \ - rm asterisk-moh-freeplay-wav.tar.gz + tar xzf asterisk-core-sounds-en-gsm-1.4.15.tar.gz ; \ + rm asterisk-core-sounds-en-gsm-1.4.15.tar.gz @echo - @echo "---------------> have to install ${SUB_INSTALLS-m} ${SUB_INSTALLS-y} <-------------------------" + @echo "---> have to install ${SUB_INSTALLS-m} ${SUB_INSTALLS-y} <---" @echo do-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y} diff --git a/package/nfs-utils/Makefile b/package/nfs-utils/Makefile index da3152d17..425810fc5 100644 --- a/package/nfs-utils/Makefile +++ b/package/nfs-utils/Makefile @@ -4,9 +4,9 @@ include ${TOPDIR}/rules.mk PKG_NAME:= nfs-utils -PKG_VERSION:= 1.1.6 +PKG_VERSION:= 1.2.0 PKG_RELEASE:= 1 -PKG_MD5SUM:= b0d1b8ec5c8c081a340cfc77bb8670cd +PKG_MD5SUM:= 779cf81044e92cb51ad590960e7b3671 PKG_DESCR:= Utilities for NFS kernel server implementation PKG_SECTION:= net PKG_DEPENDS:= portmap diff --git a/target/Config.in b/target/Config.in index b9703121f..b4c6fb06b 100644 --- a/target/Config.in +++ b/target/Config.in @@ -380,6 +380,8 @@ config ADK_TARGET_ROOTFS_EXT2_CF bool "read-write filesystem for compact flash (ext2)" depends on ADK_LINUX_X86_ALIX1C || ADK_LINUX_MIPS_RB532 select ADK_KERNEL_EXT2_FS + select ADK_KERNEL_SCSI + select ADK_KERNEL_BLK_DEV_SD help Use this option if you have a compact flash inside your hardware and want to boot from it. diff --git a/target/linux/config/Config.in.block b/target/linux/config/Config.in.block index 7bd303c60..1c9f0aa49 100644 --- a/target/linux/config/Config.in.block +++ b/target/linux/config/Config.in.block @@ -36,6 +36,10 @@ config ADK_KERNEL_SCSI boolean default n +config ADK_KERNEL_BLK_DEV_SD + boolean + default n + #config ADK_KERNEL_IDE # boolean # default n diff --git a/target/rb532/Makefile b/target/rb532/Makefile index 9fd876291..f9b05d2d9 100644 --- a/target/rb532/Makefile +++ b/target/rb532/Makefile @@ -7,8 +7,11 @@ include $(TOPDIR)/mk/modules.mk include $(TOPDIR)/mk/kernel-build.mk include $(TOPDIR)/mk/image.mk +OSTRIP:=-R .reginfo -R .notes -R .note -R .comment -R .mdebug -R .note.gnu.build-id + kernel-install: - cp $(LINUX_DIR)/vmlinux $(BIN_DIR)/${DEVICE}-${ARCH}-kernel + $(KERNEL_CROSS)objcopy $(OSTRIP) -S $(LINUX_DIR)/vmlinux \ + $(BIN_DIR)/${DEVICE}-${ARCH}-kernel ifeq ($(FS),ext2-cf) imageinstall: $(BIN_DIR)/$(ROOTFSTARBALL) diff --git a/target/rb532/kernel.config b/target/rb532/kernel.config index 5f284f91f..b5a78d466 100644 --- a/target/rb532/kernel.config +++ b/target/rb532/kernel.config @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.30 -# Fri Jun 19 11:43:06 2009 +# Sat Jun 27 21:41:18 2009 # CONFIG_MIPS=y -- cgit v1.2.3