diff options
| -rw-r--r-- | package/base-files/src/etc/mdev.conf | 2 | ||||
| -rw-r--r-- | package/grep/Makefile | 3 | ||||
| -rw-r--r-- | package/lvm/Makefile | 6 | ||||
| -rw-r--r-- | scripts/scan-tools.sh | 7 | ||||
| -rw-r--r-- | target/collections/mpdbox | 2 | ||||
| -rw-r--r-- | target/config/Config.in.tools | 4 | ||||
| -rw-r--r-- | target/linux/config/Config.in.block | 8 | ||||
| -rw-r--r-- | target/linux/kernel.config | 2 |
8 files changed, 28 insertions, 6 deletions
diff --git a/package/base-files/src/etc/mdev.conf b/package/base-files/src/etc/mdev.conf index 414e63ba1..179222221 100644 --- a/package/base-files/src/etc/mdev.conf +++ b/package/base-files/src/etc/mdev.conf @@ -12,7 +12,7 @@ tun 0:0 660 >net/tun fb0 root:video 660 snd/timer root:audio 660 snd/controlC0 root:audio 660 -snd/pcmC0D0c root:audio 660 snd/pcmC0D0p root:audio 660 +snd/pcmC0D1p root:audio 660 msr0 root:root 660 @(mkdir -p /dev/cpu/0 && ln -sf /dev/msr0 /dev/cpu/0/msr) sd[a-z][1-9]* root:root 660 */etc/mdev/fs diff --git a/package/grep/Makefile b/package/grep/Makefile index 2ef4a2ae8..d39d8ce0c 100644 --- a/package/grep/Makefile +++ b/package/grep/Makefile @@ -16,12 +16,15 @@ PKG_SITES:= ${MASTER_SITE_GNU:=grep/} PKG_NOPARALLEL:= 1 PKG_BB:= 1 +include $(ADK_TOPDIR)/mk/host.mk include $(ADK_TOPDIR)/mk/package.mk +$(eval $(call HOST_template,GREP,grep,$(PKG_VERSION)-${PKG_RELEASE})) $(eval $(call PKG_template,GREP,grep,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) grep-install: $(INSTALL_DIR) $(IDIR_GREP)/usr/bin $(INSTALL_BIN) $(WRKINST)/usr/bin/{e,f,}grep $(IDIR_GREP)/usr/bin +include ${ADK_TOPDIR}/mk/host-bottom.mk include ${ADK_TOPDIR}/mk/pkg-bottom.mk diff --git a/package/lvm/Makefile b/package/lvm/Makefile index 3237d0f9a..7ebe39c1f 100644 --- a/package/lvm/Makefile +++ b/package/lvm/Makefile @@ -4,9 +4,9 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= lvm -PKG_VERSION:= 2.02.106 -PKG_RELEASE:= 3 -PKG_MD5SUM:= 77f84279fb649b3dc4edad1c6d1a1b0e +PKG_VERSION:= 2.02.111 +PKG_RELEASE:= 1 +PKG_MD5SUM:= 02487ab2a9e02d1ee76fe217183df28a PKG_DESCR:= logical volume management PKG_SECTION:= sys/fs PKG_DEPENDS:= libdevmapper libncurses diff --git a/scripts/scan-tools.sh b/scripts/scan-tools.sh index f1c01e61a..2569d859b 100644 --- a/scripts/scan-tools.sh +++ b/scripts/scan-tools.sh @@ -250,6 +250,12 @@ if ! which gxargs >/dev/null 2>&1; then fi fi +if which grep >/dev/null 2>&1; then + if ! grep --version 2>/dev/null|grep GNU >/dev/null;then + host_build_grep=1 + fi +fi + if ! which gfind >/dev/null 2>&1; then if which find >/dev/null 2>&1; then if ! find --version 2>/dev/null|grep GNU >/dev/null;then @@ -323,6 +329,7 @@ if [ $host_build_bzip2 -eq 1 ];then printf "\t%s\n" "select ADK_HOST_BUILD_BZIP2 if [ $host_build_file -eq 1 ];then printf "\t%s\n" "select ADK_HOST_BUILD_FILE" >> $topdir/target/config/Config.in.prereq ;fi if [ $host_build_flex -eq 1 ];then printf "\t%s\n" "select ADK_HOST_BUILD_FLEX" >> $topdir/target/config/Config.in.prereq ;fi if [ $host_build_gawk -eq 1 ];then printf "\t%s\n" "select ADK_HOST_BUILD_GAWK" >> $topdir/target/config/Config.in.prereq ;fi +if [ $host_build_grep -eq 1 ];then printf "\t%s\n" "select ADK_HOST_BUILD_GREP" >> $topdir/target/config/Config.in.prereq ;fi if [ $host_build_m4 -eq 1 ];then printf "\t%s\n" "select ADK_HOST_BUILD_M4" >> $topdir/target/config/Config.in.prereq ;fi if [ $host_build_mksh -eq 1 ];then printf "\t%s\n" "select ADK_HOST_BUILD_MKSH" >> $topdir/target/config/Config.in.prereq ;fi if [ $host_build_patch -eq 1 ];then printf "\t%s\n" "select ADK_HOST_BUILD_PATCH" >> $topdir/target/config/Config.in.prereq ;fi diff --git a/target/collections/mpdbox b/target/collections/mpdbox index 4ffd9b408..facf4ffb6 100644 --- a/target/collections/mpdbox +++ b/target/collections/mpdbox @@ -4,8 +4,6 @@ config ADK_PKG_MPDBOX select ADK_PACKAGE_MPDBOX select BUSYBOX_NTPD select ADK_PACKAGE_CIFS_UTILS - select ADK_PACKAGE_NFS_UTILS - select ADK_PACKAGE_NFS_UTILS_CLIENT select ADK_PACKAGE_LIBMPDCLIENT select ADK_PACKAGE_MPC select ADK_PACKAGE_MPD diff --git a/target/config/Config.in.tools b/target/config/Config.in.tools index f255e0a5f..bdfca0606 100644 --- a/target/config/Config.in.tools +++ b/target/config/Config.in.tools @@ -62,6 +62,10 @@ config ADK_HOST_BUILD_GAWK boolean default n +config ADK_HOST_BUILD_GREP + boolean + default n + config ADK_HOST_BUILD_PATCH boolean default n diff --git a/target/linux/config/Config.in.block b/target/linux/config/Config.in.block index 46d1fa684..5eac289bc 100644 --- a/target/linux/config/Config.in.block +++ b/target/linux/config/Config.in.block @@ -90,6 +90,12 @@ config ADK_KERNEL_MMC_SDHCI_IO_ACCESSORS config ADK_KERNEL_MMC_SDHCI_PLTFM boolean +config ADK_KERNEL_MMC_BCM2835 + boolean + +config ADK_KERNEL_MMC_BCM2835_DMA + boolean + config ADK_KERNEL_MMC_SDHCI_BCM2708_DMA boolean @@ -319,6 +325,8 @@ config ADK_KERNEL_MMC_SDHCI_BCM2708 select ADK_KERNEL_MMC_SDHCI_IO_ACCESSORS select ADK_KERNEL_MMC_SDHCI_PLTFM select ADK_KERNEL_MMC_SDHCI_BCM2708_DMA + select ADK_KERNEL_MMC_BCM2835 + select ADK_KERNEL_MMC_BCM2835_DMA depends on ADK_TARGET_SYSTEM_RASPBERRY_PI default y if ADK_TARGET_SYSTEM_RASPBERRY_PI default n diff --git a/target/linux/kernel.config b/target/linux/kernel.config index 253b0b34d..b1c580da0 100644 --- a/target/linux/kernel.config +++ b/target/linux/kernel.config @@ -29,6 +29,8 @@ CONFIG_MODULE_UNLOAD=y CONFIG_BINFMT_ELF=y CONFIG_BINFMT_SCRIPT=y CONFIG_HOTPLUG=y +CONFIG_UEVENT_HELPER=y +CONFIG_UEVENT_HELPER_PATH="/sbin/mdev" CONFIG_DEVTMPFS=y CONFIG_DEVTMPFS_MOUNT=y CONFIG_STANDALONE=y |