Merge branch 'master' of git+ssh://openadk.org/git/openadk

Config.in

@@ -118,8 +118,8 @@ config ADK_KERNEL_VERSION_3_11_10
 	prompt "3.11.10"
 	boolean
 
-config ADK_KERNEL_VERSION_3_10_34
-	prompt "3.10.34"
+config ADK_KERNEL_VERSION_3_10_36
+	prompt "3.10.36"
 	boolean
 
 config ADK_KERNEL_VERSION_3_4_84
@@ -133,7 +133,7 @@ config ADK_KERNEL_VERSION
 	default "3.13.7" if ADK_KERNEL_VERSION_3_13_7
 	default "3.12.14" if ADK_KERNEL_VERSION_3_12_14
 	default "3.11.10" if ADK_KERNEL_VERSION_3_11_10
-	default "3.10.34" if ADK_KERNEL_VERSION_3_10_34
+	default "3.10.36" if ADK_KERNEL_VERSION_3_10_36
 	default "3.4.84" if ADK_KERNEL_VERSION_3_4_84
 	help
 

mk/kernel-ver.mk

@@ -22,11 +22,11 @@ KERNEL_MOD_VERSION:=	$(KERNEL_VERSION)
 KERNEL_RELEASE:=	1
 KERNEL_MD5SUM:=		59f352d3f4e2cdf6755f79e09fa09176
 endif
-ifeq ($(ADK_KERNEL_VERSION_3_10_34),y)
-KERNEL_VERSION:=	3.10.34
+ifeq ($(ADK_KERNEL_VERSION_3_10_36),y)
+KERNEL_VERSION:=	3.10.36
 KERNEL_MOD_VERSION:=	$(KERNEL_VERSION)
 KERNEL_RELEASE:=	1
-KERNEL_MD5SUM:=		30991b495a3d75196d5608072d2e62e6
+KERNEL_MD5SUM:=		721f76050755ec8ec88876ee350a2726
 endif
 ifeq ($(ADK_KERNEL_VERSION_3_4_84),y)
 KERNEL_VERSION:=	3.4.84

mk/vars.mk

@@ -169,6 +169,7 @@ LDFLAGS_FOR_BUILD?= 	-L$(STAGING_HOST_DIR)/usr/lib
 FLAGS_FOR_BUILD=	${CPPFLAGS_FOR_BUILD} ${CFLAGS_FOR_BUILD} ${LDFLAGS_FOR_BUILD}
 
 PATCH=			PATH=${HOST_PATH} ${BASH} $(SCRIPT_DIR)/patch.sh
+PATCHP0=		PATH=${HOST_PATH} patch -p0
 SED:=			PATH=${HOST_PATH} sed -i -e
 LINUX_DIR:=		$(BUILD_DIR)/linux
 KERNEL_MODULE_FLAGS:=	ARCH=${ARCH} \

package/bcm2835-bootloader/Makefile

@@ -4,15 +4,17 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		bcm2835-bootloader
-# actually 9953ce0847c04b587b694c79c5b5a4ac63f5c369 from 25.03.2014
-# https://github.com/raspberrypi/firmware
-PKG_VERSION:=		0.7
+# actually 04ba1c03780ae708c9289bce14f56933e55e9c20 from 13.04.2014
+PKG_VERSION:=		0.8
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		7ad7e5d3ad311d88d1e82fc729042d87
+PKG_MD5SUM:=		08beaa7d66e7dd6b0ab58483d0f4ce40
 PKG_DESCR:=		bootloader for raspberry pi (bcm2835)
 PKG_SECTION:=		boot
+PKG_URL:=		https://github.com/raspberrypi/firmware
 PKG_SITES:=		http://openadk.org/distfiles/
 
+DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.xz
+
 PKG_SYSTEM_DEPENDS:=	raspberry-pi
 
 include ${TOPDIR}/mk/package.mk

package/bcm2835-vc/Makefile

@@ -4,17 +4,19 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		bcm2835-vc
-# actually a8fbe2cd6a3d4455344295809f2e663373ad25cb from 25.03.2014
-# https://github.com/raspberrypi/userland
-PKG_VERSION:=		0.4
+# actually a59842a068cbd19e262701f30014499e9070fbf6 from 13.04.2014
+PKG_VERSION:=		0.5
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		091ae422e05a59ffc2b8908256047b7d
+PKG_MD5SUM:=		ed8c41f58e5657209cca73cb46b846d3
 PKG_DESCR:=		vc tools and libraries for raspberry pi
 PKG_SECTION:=		base
 PKG_DEPENDS:=		libpthread
 PKG_BUILDDEP:=		cmake-host
+PKG_URL:=		https://github.com/raspberrypi/userland
 PKG_SITES:=		http://openadk.org/distfiles/
 
+DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.xz
+
 PKG_SYSTEM_DEPENDS:=	raspberry-pi
 
 include ${TOPDIR}/mk/package.mk

package/ffmpeg/Makefile

@@ -4,9 +4,9 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		ffmpeg
-PKG_VERSION:=		2.2
+PKG_VERSION:=		2.2.1
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		744febca199548c9393b1f1ed05ccdd8
+PKG_MD5SUM:=		b8a1ee4964c2638f46fcc803ed453818
 PKG_DESCR:=		record, convert and stream audio & video
 PKG_SECTION:=		libs
 PKG_FDEPENDS:=		libpthread

package/grub/Makefile

@@ -9,7 +9,7 @@ PKG_RELEASE:=		5
 PKG_MD5SUM:=		e927540b6eda8b024fb0391eeaa4091c
 PKG_DESCR:=		GRUB2 bootloader
 PKG_SECTION:=		boot
-PKG_BUILDDEP:=		bison-host qemu-host
+PKG_BUILDDEP:=		bison-host
 PKG_URL:=		http://www.gnu.org/software/grub
 PKG_SITES:=		ftp://ftp.gnu.org/gnu/grub/
 
@@ -52,7 +52,7 @@ grub-install:
 	${INSTALL_DIR} $(IDIR_GRUB)/boot/grub/${GRUB_ARCH}
 	${CP} ${WRKINST}/usr/lib/grub/${GRUB_ARCH}/*{mod,lst,img} \
 		$(IDIR_GRUB)/boot/grub/${GRUB_ARCH}/
-	${CP} ./files/core.img.${GRUB_ARCH} \
+	-${CP} ./files/core.img.${GRUB_ARCH} \
 		$(IDIR_GRUB)/boot/grub/core.img
 
 grub-tools-install:

package/gst-plugins-base/Makefile

@@ -0,0 +1,33 @@
+# 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:=		gst-plugins-base
+PKG_VERSION:=		1.2.1
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		2e75fb03ed7e4d24d88601fcac4d57aa
+PKG_DESCR:=		gstreamer base plugins
+PKG_SECTION:=		libs
+PKG_DEPENDS:=		gstreamer
+PKG_BUILDDEP:=		gstreamer libvorbis libtheora alsa-lib
+PKG_URL:=		http://gstreamer.freedesktop.org/
+PKG_SITES:=		http://gstreamer.freedesktop.org/src/gst-plugins-base/
+PKG_OPTS:=		dev
+
+DISTFILES:=             ${PKG_NAME}-${PKG_VERSION}.tar.xz
+
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,GST_PLUGINS_BASE,gst-plugins-base,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+
+TARGET_CPPFLAGS+=	-D_GNU_SOURCE -D_POSIX_SOURCE
+
+gst-plugins-base-install:
+	$(INSTALL_DIR) $(IDIR_GST_PLUGINS_BASE)/usr/lib/gstreamer-1.0/
+	$(CP) $(WRKINST)/usr/lib/gstreamer-1.0/*.so \
+		$(IDIR_GST_PLUGINS_BASE)/usr/lib/gstreamer-1.0/
+	$(CP) $(WRKINST)/usr/lib/libgst*.so* \
+		$(IDIR_GST_PLUGINS_BASE)/usr/lib
+
+include ${TOPDIR}/mk/pkg-bottom.mk

package/gstreamer/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:=		gstreamer
+PKG_VERSION:=		1.2.1
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		55d50f48a496799dbb0b195c9c6c6153
+PKG_DESCR:=		opensource multimedia framework
+PKG_SECTION:=		libs
+PKG_URL:=		http://gstreamer.freedesktop.org/
+PKG_SITES:=		http://gstreamer.freedesktop.org/src/gstreamer/
+PKG_OPTS:=		dev
+
+DISTFILES:=             ${PKG_NAME}-${PKG_VERSION}.tar.xz
+
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,GSTREAMER,gstreamer,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+
+gstreamer-install:
+	$(INSTALL_DIR) $(IDIR_GSTREAMER)/usr/lib
+	$(CP) $(WRKINST)/usr/lib/libgstreamer*.so* \
+		$(IDIR_GSTREAMER)/usr/lib
+
+include ${TOPDIR}/mk/pkg-bottom.mk

package/gtk+/Makefile

@@ -4,10 +4,10 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		gtk+
-PKG_VERSION:=		2.24.6
+PKG_VERSION:=		2.24.22
 PKG_EXTRAVER:=		2.24
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		4d7efde4ac24dbaa720bc0744eee8235
+PKG_MD5SUM:=		5fbbfb7637bbd571a572a2dae0e736d2
 PKG_DESCR:=		GTK+ library
 PKG_SECTION:=		libs
 PKG_DEPENDS:=		glib

package/gtk+/patches/patch-Makefile_in

@@ -1,11 +1,11 @@
---- gtk+-2.24.6.orig/Makefile.in	2011-08-30 22:23:21.000000000 +0200
-+++ gtk+-2.24.6/Makefile.in	2011-11-08 18:27:10.745082865 +0100
-@@ -459,7 +459,7 @@ XVFB_START = \
+--- gtk+-2.24.22.orig/Makefile.in	2013-10-11 11:58:05.000000000 +0200
++++ gtk+-2.24.22/Makefile.in	2013-12-17 12:22:11.517248005 +0100
+@@ -552,7 +552,7 @@ XVFB_START = \
  	|| { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \
  	&& DISPLAY=:$$XID && export DISPLAY
  
 -SRC_SUBDIRS = gdk gtk modules demos tests perf
-+SRC_SUBDIRS = gdk gtk modules tests perf
++SRC_SUBDIRS = gdk gtk modules perf
  SUBDIRS = po po-properties $(SRC_SUBDIRS) docs m4macros build
  
  # require automake 1.4

package/gtk+/patches/patch-gtk_gtktypefuncs_c

@@ -1,78 +0,0 @@
---- gtk+-2.24.6.orig/gtk/gtktypefuncs.c	2011-08-30 22:24:44.000000000 +0200
-+++ gtk+-2.24.6/gtk/gtktypefuncs.c	2011-11-08 18:06:50.273051952 +0100
-@@ -54,8 +54,8 @@
- *tp++ = gdk_pixbuf_simple_anim_get_type();
- *tp++ = gdk_pixbuf_simple_anim_iter_get_type();
- *tp++ = gdk_pixmap_get_type();
--*tp++ = gdk_property_state_get_type();
- *tp++ = gdk_prop_mode_get_type();
-+*tp++ = gdk_property_state_get_type();
- *tp++ = gdk_rectangle_get_type();
- *tp++ = gdk_rgb_dither_get_type();
- *tp++ = gdk_screen_get_type();
-@@ -190,14 +190,14 @@
- *tp++ = gtk_icon_view_drop_position_get_type();
- *tp++ = gtk_icon_view_get_type();
- *tp++ = gtk_identifier_get_type();
--*tp++ = gtk_image_get_type();
--*tp++ = gtk_image_menu_item_get_type();
--*tp++ = gtk_image_type_get_type();
- *tp++ = gtk_im_context_get_type();
- *tp++ = gtk_im_context_simple_get_type();
- *tp++ = gtk_im_multicontext_get_type();
- *tp++ = gtk_im_preedit_style_get_type();
- *tp++ = gtk_im_status_style_get_type();
-+*tp++ = gtk_image_get_type();
-+*tp++ = gtk_image_menu_item_get_type();
-+*tp++ = gtk_image_type_get_type();
- *tp++ = gtk_info_bar_get_type();
- *tp++ = gtk_invisible_get_type();
- *tp++ = gtk_item_get_type();
-@@ -281,10 +281,10 @@
- *tp++ = gtk_response_type_get_type();
- *tp++ = gtk_scale_button_get_type();
- *tp++ = gtk_scale_get_type();
--*tp++ = gtk_scrollbar_get_type();
--*tp++ = gtk_scrolled_window_get_type();
- *tp++ = gtk_scroll_step_get_type();
- *tp++ = gtk_scroll_type_get_type();
-+*tp++ = gtk_scrollbar_get_type();
-+*tp++ = gtk_scrolled_window_get_type();
- *tp++ = gtk_selection_data_get_type();
- *tp++ = gtk_selection_mode_get_type();
- *tp++ = gtk_sensitivity_type_get_type();
-@@ -301,11 +301,11 @@
- *tp++ = gtk_sort_type_get_type();
- *tp++ = gtk_spin_button_get_type();
- *tp++ = gtk_spin_button_update_policy_get_type();
--*tp++ = gtk_spinner_get_type();
- *tp++ = gtk_spin_type_get_type();
-+*tp++ = gtk_spinner_get_type();
- *tp++ = gtk_state_type_get_type();
--*tp++ = gtk_statusbar_get_type();
- *tp++ = gtk_status_icon_get_type();
-+*tp++ = gtk_statusbar_get_type();
- *tp++ = gtk_style_get_type();
- *tp++ = gtk_submenu_direction_get_type();
- *tp++ = gtk_submenu_placement_get_type();
-@@ -329,16 +329,16 @@
- *tp++ = gtk_toggle_action_get_type();
- *tp++ = gtk_toggle_button_get_type();
- *tp++ = gtk_toggle_tool_button_get_type();
--*tp++ = gtk_toolbar_child_type_get_type();
--*tp++ = gtk_toolbar_get_type();
--*tp++ = gtk_toolbar_space_style_get_type();
--*tp++ = gtk_toolbar_style_get_type();
- *tp++ = gtk_tool_button_get_type();
- *tp++ = gtk_tool_item_get_type();
- *tp++ = gtk_tool_item_group_get_type();
- *tp++ = gtk_tool_palette_drag_targets_get_type();
- *tp++ = gtk_tool_palette_get_type();
- *tp++ = gtk_tool_shell_get_type();
-+*tp++ = gtk_toolbar_child_type_get_type();
-+*tp++ = gtk_toolbar_get_type();
-+*tp++ = gtk_toolbar_space_style_get_type();
-+*tp++ = gtk_toolbar_style_get_type();
- *tp++ = gtk_tooltip_get_type();
- *tp++ = gtk_tree_drag_dest_get_type();
- *tp++ = gtk_tree_drag_source_get_type();

package/omxplayer/Makefile

@@ -4,10 +4,10 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		omxplayer
-# actually 1ca2f7adaa7f6a92410d9664e76c395537659dba from 07.04.2014
-PKG_VERSION:=		0.4
-PKG_RELEASE:=		2
-PKG_MD5SUM:=		d4efff32305bd16315e6fa4f80ea2a98
+# actually 46616c55c2fad3dac47d17e8a6b41a16a4d6f15e from 13.04.2014
+PKG_VERSION:=		0.5
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		1c882539dfcbc4e8efeae85ff8069cbe
 PKG_DESCR:=		video player for raspberry pi
 PKG_SECTION:=		multimedia
 PKG_DEPENDS:=		libffmpeg boost bcm2835-vc libfreetype libpcre
@@ -16,6 +16,8 @@ PKG_BUILDDEP:=		ffmpeg boost bcm2835-vc freetype pcre dbus
 PKG_URL:=		https://github.com/popcornmix/omxplayer
 PKG_SITES:=		http://openadk.org/distfiles/
 
+DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.xz
+
 PKG_SYSTEM_DEPENDS:=	raspberry-pi
 PKG_LIBC_DEPENDS:=      glibc musl
 

package/python2/Makefile

@@ -108,7 +108,7 @@ hostpre-configure:
 	$(CP) $(TOPDIR)/package/python2/files/patch-Lib_distutils_sysconfig_py $(WRKBUILD)
 	$(SED) "s#@@STAGING_TARGET_DIR@@#$(STAGING_TARGET_DIR)#" $(WRKBUILD)/patch-Lib_distutils_sysconfig_py
 	$(SED) "s#@@STAGING_HOST_DIR@@#$(STAGING_HOST_DIR)#" $(WRKBUILD)/patch-Lib_distutils_sysconfig_py
-	(cd $(WRKBUILD) && patch -p0 < patch-Lib_distutils_sysconfig_py)	
+	(cd $(WRKBUILD) && ${PATCHP0} < patch-Lib_distutils_sysconfig_py)	
 	$(SED) "s#@EXENAME@#$(STAGING_HOST_DIR)/usr/bin/python#" \
 		$(WRKBUILD)/Misc/python-config.in
 
@@ -119,13 +119,13 @@ hostpost-install:
 	$(SED) "s#@@STAGING_TARGET_DIR@@#$(STAGING_TARGET_DIR)#" $(WRKBUILD)/python-config.patch
 	$(SED) "s#@@STAGING_HOST_DIR@@#$(STAGING_HOST_DIR)#" $(WRKBUILD)/python-config.patch
 	(cd $(STAGING_HOST_DIR)/usr/bin && \
-		patch -p0 < $(WRKBUILD)/python-config.patch)
+		${PATCHP0} < $(WRKBUILD)/python-config.patch)
 
 pre-configure:
 	$(CP) $(TOPDIR)/package/python2/files/patch-Lib_distutils_sysconfig_py $(WRKBUILD)
 	$(SED) "s#@@STAGING_TARGET_DIR@@#$(STAGING_TARGET_DIR)#" $(WRKBUILD)/patch-Lib_distutils_sysconfig_py
 	$(SED) "s#@@STAGING_HOST_DIR@@#$(STAGING_HOST_DIR)#" $(WRKBUILD)/patch-Lib_distutils_sysconfig_py
-	(cd $(WRKBUILD) && patch -p0 <$(WRKBUILD)/patch-Lib_distutils_sysconfig_py)	
+	(cd $(WRKBUILD) && ${PATCHP0} <$(WRKBUILD)/patch-Lib_distutils_sysconfig_py)	
 	$(SED) "s#@EXENAME@#$(STAGING_HOST_DIR)/usr/bin/python#" \
 		$(WRKBUILD)/Misc/python-config.in
 

package/xbmc/patches/patch-lib_xbmc-dll-symbols_DllAvFormat_c

@@ -0,0 +1,11 @@
+--- xbmc-12.3-Frodo.orig/lib/xbmc-dll-symbols/DllAvFormat.c	2013-12-12 22:47:49.000000000 +0100
++++ xbmc-12.3-Frodo/lib/xbmc-dll-symbols/DllAvFormat.c	2014-04-14 17:07:49.000000000 +0200
+@@ -110,7 +110,7 @@ void av_read_frame_flush(AVFormatContext
+ #define RELATIVE_TS_BASE (INT64_MAX - (1LL<<48))
+         if(st->first_dts == AV_NOPTS_VALUE) st->cur_dts = RELATIVE_TS_BASE;
+         else                                st->cur_dts = AV_NOPTS_VALUE; /* we set the current DTS to an unspecified origin */
+-        st->reference_dts = AV_NOPTS_VALUE;
++        //st->reference_dts = AV_NOPTS_VALUE;
+ 
+         st->probe_packets = MAX_PROBE_PACKETS;
+ #endif

toolchain/kernel-headers/patches/3.10.34/cleankernel.patch

@@ -1,11 +0,0 @@
-diff -Nur linux-3.10.30.orig/scripts/Makefile.headersinst linux-3.10.30/scripts/Makefile.headersinst
---- linux-3.10.30.orig/scripts/Makefile.headersinst	2014-02-13 22:48:15.000000000 +0100
-+++ linux-3.10.30/scripts/Makefile.headersinst	2014-03-09 09:47:17.000000000 +0100
-@@ -99,7 +99,6 @@
- 
- targets += $(install-file)
- $(install-file): scripts/headers_install.sh $(input-files) FORCE
--	$(if $(unwanted),$(call cmd,remove),)
- 	$(if $(wildcard $(dir $@)),,$(shell mkdir -p $(dir $@)))
- 	$(call if_changed,install)
- 

toolchain/kernel-headers/patches/3.10.36/headers-install.patch

@@ -0,0 +1,91 @@
+diff -Nur linux-3.10.36.orig/scripts/headers_install.sh linux-3.10.36/scripts/headers_install.sh
+--- linux-3.10.36.orig/scripts/headers_install.sh	2014-04-03 21:01:22.000000000 +0200
++++ linux-3.10.36/scripts/headers_install.sh	2014-04-14 20:32:34.000000000 +0200
+@@ -2,7 +2,7 @@
+ 
+ if [ $# -lt 1 ]
+ then
+-	echo "Usage: headers_install.sh OUTDIR [FILES...]
++	echo "Usage: headers_install.sh OUTDIR SRCDIR [FILES...]
+ 	echo
+ 	echo "Prepares kernel header files for use by user space, by removing"
+ 	echo "all compiler.h definitions and #includes, removing any"
+@@ -10,6 +10,7 @@
+ 	echo "asm/inline/volatile keywords."
+ 	echo
+ 	echo "OUTDIR: directory to write each userspace header FILE to."
++	echo "SRCDIR: source directory where files are picked."
+ 	echo "FILES:  list of header files to operate on."
+ 
+ 	exit 1
+@@ -19,6 +20,8 @@
+ 
+ OUTDIR="$1"
+ shift
++SRCDIR="$1"
++shift
+ 
+ # Iterate through files listed on command line
+ 
+@@ -34,7 +37,7 @@
+ 		-e 's/(^|[^a-zA-Z0-9])__packed([^a-zA-Z0-9_]|$)/\1__attribute__((packed))\2/g' \
+ 		-e 's/(^|[ \t(])(inline|asm|volatile)([ \t(]|$)/\1__\2__\3/g' \
+ 		-e 's@#(ifndef|define|endif[ \t]*/[*])[ \t]*_UAPI@#\1 @' \
+-		"$i" > "$OUTDIR/$FILE.sed" || exit 1
++		"$SRCDIR/$i" > "$OUTDIR/$FILE.sed" || exit 1
+ 	scripts/unifdef -U__KERNEL__ -D__EXPORTED_HEADERS__ "$OUTDIR/$FILE.sed" \
+ 		> "$OUTDIR/$FILE"
+ 	[ $? -gt 1 ] && exit 1
+diff -Nur linux-3.10.36.orig/scripts/Makefile.headersinst linux-3.10.36/scripts/Makefile.headersinst
+--- linux-3.10.36.orig/scripts/Makefile.headersinst	2014-04-03 21:01:22.000000000 +0200
++++ linux-3.10.36/scripts/Makefile.headersinst	2014-04-14 20:42:47.000000000 +0200
+@@ -47,18 +47,24 @@
+ all-files     := $(header-y) $(genhdr-y) $(wrapper-files)
+ output-files  := $(addprefix $(installdir)/, $(all-files))
+ 
+-input-files   := $(foreach hdr, $(header-y), \
++input-files1  := $(foreach hdr, $(header-y), \
+ 		   $(if $(wildcard $(srcdir)/$(hdr)), \
+-			$(wildcard $(srcdir)/$(hdr)), \
++			$(wildcard $(srcdir)/$(hdr))) \
++		   )
++input-files1-name := $(notdir $(input-files1))
++input-files2  := $(foreach hdr, $(header-y), \
++		   $(if  $(wildcard $(srcdir)/$(hdr)),, \
+ 			$(if $(wildcard $(oldsrcdir)/$(hdr)), \
+ 				$(wildcard $(oldsrcdir)/$(hdr)), \
+ 				$(error Missing UAPI file $(srcdir)/$(hdr))) \
+-		   )) \
+-		 $(foreach hdr, $(genhdr-y), \
++		   ))
++input-files2-name := $(notdir $(input-files2))
++input-files3  := $(foreach hdr, $(genhdr-y), \
+ 		   $(if	$(wildcard $(gendir)/$(hdr)), \
+ 			$(wildcard $(gendir)/$(hdr)), \
+ 			$(error Missing generated UAPI file $(gendir)/$(hdr)) \
+ 		   ))
++input-files3-name := $(notdir $(input-files3))
+ 
+ # Work out what needs to be removed
+ oldheaders    := $(patsubst $(installdir)/%,%,$(wildcard $(installdir)/*.h))
+@@ -72,7 +78,9 @@
+ quiet_cmd_install = INSTALL $(printdir) ($(words $(all-files))\
+                             file$(if $(word 2, $(all-files)),s))
+       cmd_install = \
+-        $(CONFIG_SHELL) $< $(installdir) $(input-files); \
++        $(CONFIG_SHELL) $< $(installdir) $(srcdir) $(input-files1-name); \
++        $(CONFIG_SHELL) $< $(installdir) $(oldsrcdir) $(input-files2-name); \
++        $(CONFIG_SHELL) $< $(installdir) $(gendir) $(input-files3-name); \
+         for F in $(wrapper-files); do                                   \
+                 echo "\#include <asm-generic/$$F>" > $(installdir)/$$F;    \
+         done;                                                           \
+@@ -98,8 +106,7 @@
+ 	@:
+ 
+ targets += $(install-file)
+-$(install-file): scripts/headers_install.sh $(input-files) FORCE
+-	$(if $(unwanted),$(call cmd,remove),)
++$(install-file): scripts/headers_install.sh $(input-files1) $(input-files2) $(input-files3) FORCE
+ 	$(if $(wildcard $(dir $@)),,$(shell mkdir -p $(dir $@)))
+ 	$(call if_changed,install)
+