Browse Source

add new PKG_GIT variable

We can now clone git tags and branches in a more performant
way. No change for specific hashes, other then PKG_GIT is required
now. Do not remove .git dirs, as the downloaded code might be
used to add a patch and send upstream.
Add git as requirement for downloading.

Remove unmaintained u-boot-git package.
Waldemar Brodkorb 8 years ago
parent
commit
f0fc482850

+ 3 - 0
README

@@ -12,8 +12,11 @@ Before you can start you need to install some software:
 - gzip
 - gzip
 - perl
 - perl
 - curl or wget
 - curl or wget
+- git
+- strings
 - c library headers
 - c library headers
 - ncurses library and header
 - ncurses library and header
+- zlib library and header
 
 
 There is a check for the required versions of these software in advance, though.
 There is a check for the required versions of these software in advance, though.
 Most of the needed software for the build process to succeed will
 Most of the needed software for the build process to succeed will

+ 1 - 1
mk/buildhlp.mk

@@ -81,7 +81,7 @@ ${WRKDIST}/.prepared: ${WRKDIST}/.extract_done
 	[ ! -d ./src ] || (cd src; $(PREVENT_PATCH) cp -Rp . ${WRKDIST}/) \
 	[ ! -d ./src ] || (cd src; $(PREVENT_PATCH) cp -Rp . ${WRKDIST}/) \
 		$(MAKE_TRACE)
 		$(MAKE_TRACE)
 	@${MAKE} post-patch $(MAKE_TRACE)
 	@${MAKE} post-patch $(MAKE_TRACE)
-	# always use latest config.sub/config.guess from OpenADK scripts directory
+	@# always use latest config.sub/config.guess from OpenADK scripts directory
 	@cd ${WRKDIST}; \
 	@cd ${WRKDIST}; \
 	    for i in $$(find . -name config.sub);do \
 	    for i in $$(find . -name config.sub);do \
 		if [ -f $$i ]; then \
 		if [ -f $$i ]; then \

+ 20 - 10
mk/fetch.mk

@@ -64,20 +64,30 @@ $(1):
 	for url in "${PKG_SITES}"; do case $$$$url in \
 	for url in "${PKG_SITES}"; do case $$$$url in \
 	   git://*|*.git) \
 	   git://*|*.git) \
 		rm -rf $${PKG_NAME}-$${PKG_VERSION}; \
 		rm -rf $${PKG_NAME}-$${PKG_VERSION}; \
-		git clone --quiet $${PKG_SITES} $${PKG_NAME}-$${PKG_VERSION}; \
-		if [ $$$$(echo $${PKG_VERSION}|wc -c) -eq 41 ]; then \
-			(cd $${PKG_NAME}-$${PKG_VERSION}; \
-			echo "Checking out $${PKG_VERSION}"; \
-			git checkout --quiet $${PKG_VERSION}) >/dev/null; \
-		else \
-			echo "Using head"; \
-		fi; \
-		touch $$$${filename}.nohash; \
-		rm -rf $${PKG_NAME}-$${PKG_VERSION}/.git; \
+		if [ ! -z "$${PKG_GIT}" ]; then \
+		case "$${PKG_GIT}" in \
+		  tag|branch) \
+			echo "Using git tag/branch: $${PKG_VERSION}"; \
+			git clone --depth 1 --branch $${PKG_VERSION} $(GITOPTS) $${PKG_SITES} $${PKG_NAME}-$${PKG_VERSION}; \
+			;; \
+		  hash) \
+			echo "Using git hash: $${PKG_VERSION}"; \
+			git clone $(GITOPTS) $${PKG_SITES} $${PKG_NAME}-$${PKG_VERSION}; \
+			(cd $${PKG_NAME}-$${PKG_VERSION}; git checkout $(GITOPTS) $${PKG_VERSION}); \
+			;; \
+		  head) \
+			echo "Using git head"; \
+			git clone $(GITOPTS) $${PKG_SITES} $${PKG_NAME}-$${PKG_VERSION}; \
+			;; \
+		esac ;\
 		tar cJf $${PKG_NAME}-$${PKG_VERSION}.tar.xz $${PKG_NAME}-$${PKG_VERSION}; \
 		tar cJf $${PKG_NAME}-$${PKG_VERSION}.tar.xz $${PKG_NAME}-$${PKG_VERSION}; \
+		touch $$$${filename}.nohash; \
 		rm -rf $${PKG_NAME}-$${PKG_VERSION}; \
 		rm -rf $${PKG_NAME}-$${PKG_VERSION}; \
 		: check the size here; \
 		: check the size here; \
 		[[ ! -e $$$$filename ]] || exit 0; \
 		[[ ! -e $$$$filename ]] || exit 0; \
+		else \
+		   	echo "PKG_GIT is missing" ;\
+		fi; \
 		;; \
 		;; \
 	    http://*|https://*|ftp://*) \
 	    http://*|https://*|ftp://*) \
 		for site in $${PKG_SITES} $${MASTER_SITE_BACKUP}; do \
 		for site in $${PKG_SITES} $${MASTER_SITE_BACKUP}; do \

+ 1 - 0
package/aufs-util/Makefile

@@ -6,6 +6,7 @@ include $(ADK_TOPDIR)/rules.mk
 PKG_NAME:=		aufs-util
 PKG_NAME:=		aufs-util
 # branch aufs4.0
 # branch aufs4.0
 PKG_VERSION:=		5e0c348bd8b1898beb1e043b026bcb0e0c7b0d54
 PKG_VERSION:=		5e0c348bd8b1898beb1e043b026bcb0e0c7b0d54
+PKG_GIT:=		hash
 PKG_RELEASE:=		1
 PKG_RELEASE:=		1
 PKG_DESCR:=		aufs utilities (version 3 and above)
 PKG_DESCR:=		aufs utilities (version 3 and above)
 PKG_SECTION:=		sys/fs
 PKG_SECTION:=		sys/fs

+ 2 - 1
package/bcm28xx-bootloader/Makefile

@@ -4,7 +4,8 @@
 include $(ADK_TOPDIR)/rules.mk
 include $(ADK_TOPDIR)/rules.mk
 
 
 PKG_NAME:=		bcm28xx-bootloader
 PKG_NAME:=		bcm28xx-bootloader
-PKG_VERSION:=		ba7a8fb709adab287495f4e836b1cd3e5c9db409
+PKG_VERSION:=		1.20160209
+PKG_GIT:=		tag
 PKG_RELEASE:=		1
 PKG_RELEASE:=		1
 PKG_DESCR:=		bootloader for bcm28xx
 PKG_DESCR:=		bootloader for bcm28xx
 PKG_SECTION:=		base/boot
 PKG_SECTION:=		base/boot

+ 1 - 0
package/bcm28xx-vc/Makefile

@@ -5,6 +5,7 @@ include $(ADK_TOPDIR)/rules.mk
 
 
 PKG_NAME:=		bcm28xx-vc
 PKG_NAME:=		bcm28xx-vc
 PKG_VERSION:=		c2f27fb8e581f8e5af83bf28422553ade8f7a7c8
 PKG_VERSION:=		c2f27fb8e581f8e5af83bf28422553ade8f7a7c8
+PKG_GIT:=		hash
 PKG_RELEASE:=		2
 PKG_RELEASE:=		2
 PKG_DESCR:=		videocore tools and libraries
 PKG_DESCR:=		videocore tools and libraries
 PKG_SECTION:=		libs/video
 PKG_SECTION:=		libs/video

+ 1 - 0
package/device-tree-compiler/Makefile

@@ -5,6 +5,7 @@ include $(ADK_TOPDIR)/rules.mk
 
 
 PKG_NAME:=		device-tree-compiler
 PKG_NAME:=		device-tree-compiler
 PKG_VERSION:=		b06e55c88b9b922ff7e25cd62a4709b65524f0fc
 PKG_VERSION:=		b06e55c88b9b922ff7e25cd62a4709b65524f0fc
+PKG_GIT:=		hash
 PKG_RELEASE:=		1
 PKG_RELEASE:=		1
 PKG_DESCR:=		compiler for dts files
 PKG_DESCR:=		compiler for dts files
 PKG_SECTION:=		sys/misc
 PKG_SECTION:=		sys/misc

+ 1 - 0
package/forked-daapd/Makefile

@@ -6,6 +6,7 @@ include $(ADK_TOPDIR)/rules.mk
 PKG_NAME:=		forked-daapd
 PKG_NAME:=		forked-daapd
 PKG_VERSION:=		879c2ef35011b6fbb7bc8755c2b3c4f5c3cc506c
 PKG_VERSION:=		879c2ef35011b6fbb7bc8755c2b3c4f5c3cc506c
 PKG_RELEASE:=		1
 PKG_RELEASE:=		1
+PKG_GIT:=		hash
 PKG_DESCR:=		daapd server
 PKG_DESCR:=		daapd server
 PKG_SECTION:=		mm/audio
 PKG_SECTION:=		mm/audio
 PKG_DEPENDS:=		libunistring zlib libconfuse sqlite libffmpeg libgcrypt
 PKG_DEPENDS:=		libunistring zlib libconfuse sqlite libffmpeg libgcrypt

+ 1 - 0
package/freeswitch/Makefile

@@ -6,6 +6,7 @@ include $(ADK_TOPDIR)/rules.mk
 PKG_NAME:=		freeswitch
 PKG_NAME:=		freeswitch
 PKG_VERSION:=		6762f14140f5bf70647c037c4ef527392796af34
 PKG_VERSION:=		6762f14140f5bf70647c037c4ef527392796af34
 PKG_RELEASE:=		1
 PKG_RELEASE:=		1
+PKG_GIT:=		hash
 PKG_DESCR:=		cross-platform telephony platform
 PKG_DESCR:=		cross-platform telephony platform
 PKG_SECTION:=		net/voip
 PKG_SECTION:=		net/voip
 PKG_DEPENDS:=		libpcre libcurl zlib libjpeg-turbo libsqlite
 PKG_DEPENDS:=		libpcre libcurl zlib libjpeg-turbo libsqlite

+ 1 - 0
package/jsoncpp/Makefile

@@ -5,6 +5,7 @@ include $(ADK_TOPDIR)/rules.mk
 
 
 PKG_NAME:=		jsoncpp
 PKG_NAME:=		jsoncpp
 PKG_VERSION:=		9cb88d2ca66af19c53a98843d159cc1d32ebaec6
 PKG_VERSION:=		9cb88d2ca66af19c53a98843d159cc1d32ebaec6
+PKG_GIT:=		hash
 PKG_RELEASE:=		1
 PKG_RELEASE:=		1
 PKG_DESCR:=		c++ library for json
 PKG_DESCR:=		c++ library for json
 PKG_SECTION:=		libs/misc
 PKG_SECTION:=		libs/misc

+ 1 - 0
package/libc-test/Makefile

@@ -6,6 +6,7 @@ include $(ADK_TOPDIR)/rules.mk
 PKG_NAME:=		libc-test
 PKG_NAME:=		libc-test
 PKG_VERSION:=		c36565301d8fd07a91234842ae09379fe99e112a
 PKG_VERSION:=		c36565301d8fd07a91234842ae09379fe99e112a
 PKG_RELEASE:=		1
 PKG_RELEASE:=		1
+PKG_GIT:=		hash
 PKG_DESCR:=		libc test suite
 PKG_DESCR:=		libc test suite
 PKG_SECTION:=		base/tests
 PKG_SECTION:=		base/tests
 PKG_DEPENDS:=		make
 PKG_DEPENDS:=		make

+ 1 - 0
package/libcec/Makefile

@@ -6,6 +6,7 @@ include $(ADK_TOPDIR)/rules.mk
 PKG_NAME:=		libcec
 PKG_NAME:=		libcec
 PKG_VERSION:=		d156e7cb684f86a9d73f8dcf087d4799c62d9721
 PKG_VERSION:=		d156e7cb684f86a9d73f8dcf087d4799c62d9721
 PKG_RELEASE:=		1
 PKG_RELEASE:=		1
+PKG_GIT:=		hash
 PKG_DESCR:=		control your device with your tv remote control
 PKG_DESCR:=		control your device with your tv remote control
 PKG_SECTION:=		libs/video
 PKG_SECTION:=		libs/video
 PKG_DEPENDS:=		libudev libplatform
 PKG_DEPENDS:=		libudev libplatform

+ 1 - 0
package/libcli/Makefile

@@ -6,6 +6,7 @@ include ${ADK_TOPDIR}/rules.mk
 PKG_NAME:=		libcli
 PKG_NAME:=		libcli
 PKG_VERSION:=		c63c9d35144939c8b4fa3c5394aed2e29ff517b0
 PKG_VERSION:=		c63c9d35144939c8b4fa3c5394aed2e29ff517b0
 PKG_RELEASE:=		1
 PKG_RELEASE:=		1
+PKG_GIT:=		hash
 PKG_DESCR:=		cisco-like command-line interface library
 PKG_DESCR:=		cisco-like command-line interface library
 PKG_SECTION:=		libs/misc
 PKG_SECTION:=		libs/misc
 PKG_URL:=		http://sites.dparrish.com/libcli
 PKG_URL:=		http://sites.dparrish.com/libcli

+ 1 - 0
package/libcrossguid/Makefile

@@ -6,6 +6,7 @@ include $(ADK_TOPDIR)/rules.mk
 PKG_NAME:=		libcrossguid
 PKG_NAME:=		libcrossguid
 PKG_VERSION:=		8f399e8bd4252be9952f3dfa8199924cc8487ca4
 PKG_VERSION:=		8f399e8bd4252be9952f3dfa8199924cc8487ca4
 PKG_RELEASE:=		1
 PKG_RELEASE:=		1
+PKG_GIT:=		hash
 PKG_DESCR:=		c++ guid library
 PKG_DESCR:=		c++ guid library
 PKG_SECTION:=		libs/misc
 PKG_SECTION:=		libs/misc
 PKG_URL:=		https://github.com/graeme-hill/crossguid
 PKG_URL:=		https://github.com/graeme-hill/crossguid

+ 1 - 0
package/libssh/Makefile

@@ -6,6 +6,7 @@ include $(ADK_TOPDIR)/rules.mk
 PKG_NAME:=		libssh
 PKG_NAME:=		libssh
 PKG_VERSION:=		8ec46cbd42c2af7b7e1a06e3b3087e97526b558e
 PKG_VERSION:=		8ec46cbd42c2af7b7e1a06e3b3087e97526b558e
 PKG_RELEASE:=		1
 PKG_RELEASE:=		1
+PKG_GIT:=		hash
 PKG_DESCR:=		secure shell library
 PKG_DESCR:=		secure shell library
 PKG_SECTION:=		libs/net
 PKG_SECTION:=		libs/net
 PKG_DEPENDS:=		zlib
 PKG_DEPENDS:=		zlib

+ 1 - 1
package/libx264/Makefile

@@ -6,7 +6,7 @@ include $(ADK_TOPDIR)/rules.mk
 PKG_NAME:=		libx264
 PKG_NAME:=		libx264
 PKG_VERSION:=		40bb56814e56ed342040bdbf30258aab39ee9e89
 PKG_VERSION:=		40bb56814e56ed342040bdbf30258aab39ee9e89
 PKG_RELEASE:=		1
 PKG_RELEASE:=		1
-PKG_HASH:=		88f63bd104b9127ebbaa6a88931c9f02d84f0dd4b5b3994ff38852735f60ead3
+PKG_GIT:=		hash
 PKG_DESCR:=		h264 encoding library
 PKG_DESCR:=		h264 encoding library
 PKG_SECTION:=		libs/video
 PKG_SECTION:=		libs/video
 PKG_URL:=		http://www.videolan.org/developers/x264.html
 PKG_URL:=		http://www.videolan.org/developers/x264.html

+ 1 - 0
package/ltrace/Makefile

@@ -6,6 +6,7 @@ include $(ADK_TOPDIR)/rules.mk
 PKG_NAME:=		ltrace
 PKG_NAME:=		ltrace
 PKG_VERSION:=		c18a46eff706e956c4dc755144d752dc163a1145
 PKG_VERSION:=		c18a46eff706e956c4dc755144d752dc163a1145
 PKG_RELEASE:=		1
 PKG_RELEASE:=		1
+PKG_GIT:=		hash
 PKG_DESCR:=		intercepts and records dynamic library calls 
 PKG_DESCR:=		intercepts and records dynamic library calls 
 PKG_SECTION:=		app/debug
 PKG_SECTION:=		app/debug
 PKG_DEPENDS:=		libelf
 PKG_DEPENDS:=		libelf

+ 1 - 0
package/omxplayer/Makefile

@@ -6,6 +6,7 @@ include $(ADK_TOPDIR)/rules.mk
 PKG_NAME:=		omxplayer
 PKG_NAME:=		omxplayer
 PKG_VERSION:=		c5ab80828159c64a283ff69d40748923648f8a0a
 PKG_VERSION:=		c5ab80828159c64a283ff69d40748923648f8a0a
 PKG_RELEASE:=		1
 PKG_RELEASE:=		1
+PKG_GIT:=		hash
 PKG_DESCR:=		video player for raspberry pi
 PKG_DESCR:=		video player for raspberry pi
 PKG_SECTION:=		mm/video
 PKG_SECTION:=		mm/video
 PKG_DEPENDS:=		libffmpeg bcm28xx-vc-libs bcm28xx-vc-gl-libs
 PKG_DEPENDS:=		libffmpeg bcm28xx-vc-libs bcm28xx-vc-gl-libs

+ 1 - 0
package/picocom/Makefile

@@ -6,6 +6,7 @@ include ${ADK_TOPDIR}/rules.mk
 PKG_NAME:=		picocom
 PKG_NAME:=		picocom
 PKG_VERSION:=		14288582f10e662732c32eb67ab49b64fd6206c2
 PKG_VERSION:=		14288582f10e662732c32eb67ab49b64fd6206c2
 PKG_RELEASE:=		1
 PKG_RELEASE:=		1
+PKG_GIT:=		hash
 PKG_DESCR:=		minimal dumb-terminal emulation program
 PKG_DESCR:=		minimal dumb-terminal emulation program
 PKG_SECTION:=		sys/serial
 PKG_SECTION:=		sys/serial
 PKG_URL:=		https://github.com/npat-efault/picocom/
 PKG_URL:=		https://github.com/npat-efault/picocom/

+ 1 - 0
package/platform/Makefile

@@ -6,6 +6,7 @@ include $(ADK_TOPDIR)/rules.mk
 PKG_NAME:=		platform
 PKG_NAME:=		platform
 PKG_VERSION:=		aafa6e9f3b86f2258f5f75809849743b1779072b
 PKG_VERSION:=		aafa6e9f3b86f2258f5f75809849743b1779072b
 PKG_RELEASE:=		1
 PKG_RELEASE:=		1
+PKG_GIT:=		hash
 PKG_DESCR:=		platform library used by libcec
 PKG_DESCR:=		platform library used by libcec
 PKG_SECTION:=		libs/misc
 PKG_SECTION:=		libs/misc
 PKG_URL:=		https://github.com/Pulse-Eight/platform
 PKG_URL:=		https://github.com/Pulse-Eight/platform

+ 1 - 0
package/py-spidev/Makefile

@@ -6,6 +6,7 @@ include $(ADK_TOPDIR)/rules.mk
 PKG_NAME:=		py-spidev
 PKG_NAME:=		py-spidev
 PKG_VERSION:=		1c713aaaad1f611d675d9188d2d5a6401fbb8843
 PKG_VERSION:=		1c713aaaad1f611d675d9188d2d5a6401fbb8843
 PKG_RELEASE:=		1
 PKG_RELEASE:=		1
+PKG_GIT:=		hash
 PKG_DESCR:=		module for interfacing with spi devices from user space via the spidev linux kernel driver
 PKG_DESCR:=		module for interfacing with spi devices from user space via the spidev linux kernel driver
 PKG_SECTION:=		dev/python
 PKG_SECTION:=		dev/python
 PKG_DEPENDS:=		python2
 PKG_DEPENDS:=		python2

+ 1 - 0
package/rt-tests/Makefile

@@ -6,6 +6,7 @@ include $(ADK_TOPDIR)/rules.mk
 PKG_NAME:=		rt-tests
 PKG_NAME:=		rt-tests
 PKG_VERSION:=		3fed00ff8d2c0cdbc5ba078cbd60ce3cfcee615f
 PKG_VERSION:=		3fed00ff8d2c0cdbc5ba078cbd60ce3cfcee615f
 PKG_RELEASE:=		1
 PKG_RELEASE:=		1
+PKG_GIT:=		hash
 PKG_DESCR:=		realtime test apps
 PKG_DESCR:=		realtime test apps
 PKG_NEEDS:=		threads rt
 PKG_NEEDS:=		threads rt
 PKG_SECTION:=		base/tests
 PKG_SECTION:=		base/tests

+ 1 - 0
package/squeezelite/Makefile

@@ -6,6 +6,7 @@ include $(ADK_TOPDIR)/rules.mk
 PKG_NAME:=		squeezelite
 PKG_NAME:=		squeezelite
 PKG_VERSION:=		8b8dfe6918ebe45ade5f3d9b68d453d7b8128d99
 PKG_VERSION:=		8b8dfe6918ebe45ade5f3d9b68d453d7b8128d99
 PKG_RELEASE:=		1
 PKG_RELEASE:=		1
+PKG_GIT:=		hash
 PKG_DESCR:=		headless squeezebox emulator
 PKG_DESCR:=		headless squeezebox emulator
 PKG_SECTION:=		mm/audio
 PKG_SECTION:=		mm/audio
 PKG_DEPENDS:=		libflac alsa-lib libvorbis libmad libfaad2
 PKG_DEPENDS:=		libflac alsa-lib libvorbis libmad libfaad2

+ 1 - 0
package/stats/Makefile

@@ -6,6 +6,7 @@ include $(ADK_TOPDIR)/rules.mk
 PKG_NAME:=		stats
 PKG_NAME:=		stats
 PKG_VERSION:=		82bd4977b607b8714f361467e37a9d801ff911b6
 PKG_VERSION:=		82bd4977b607b8714f361467e37a9d801ff911b6
 PKG_RELEASE:=		1
 PKG_RELEASE:=		1
+PKG_GIT:=		hash
 PKG_DESCR:=		stats utility
 PKG_DESCR:=		stats utility
 PKG_SECTION:=		sys/utils
 PKG_SECTION:=		sys/utils
 PKG_URL:=		https://github.com/rustyrussell/stats
 PKG_URL:=		https://github.com/rustyrussell/stats

+ 1 - 0
package/sysdig/Makefile

@@ -5,6 +5,7 @@ include $(ADK_TOPDIR)/rules.mk
 
 
 PKG_NAME:=		sysdig
 PKG_NAME:=		sysdig
 PKG_VERSION:=		d7f05fc973080f5471af596cbcc8e2b2efc9e934
 PKG_VERSION:=		d7f05fc973080f5471af596cbcc8e2b2efc9e934
+PKG_GIT:=		hash
 PKG_RELEASE:=		1
 PKG_RELEASE:=		1
 PKG_DESCR:=		system troubleshooting tool
 PKG_DESCR:=		system troubleshooting tool
 PKG_SECTION:=		app/debug
 PKG_SECTION:=		app/debug

+ 9 - 0
package/tvheadend/Makefile

@@ -5,12 +5,21 @@ include $(ADK_TOPDIR)/rules.mk
 
 
 PKG_NAME:=		tvheadend
 PKG_NAME:=		tvheadend
 PKG_VERSION:=		679b7797128b8979145dc2a0a3c54ea513a0466b
 PKG_VERSION:=		679b7797128b8979145dc2a0a3c54ea513a0466b
+PKG_GIT:=		hash
 PKG_RELEASE:=		3
 PKG_RELEASE:=		3
 PKG_DESCR:=		tv streaming server
 PKG_DESCR:=		tv streaming server
 PKG_SECTION:=		mm/video
 PKG_SECTION:=		mm/video
 PKG_URL:=		https://tvheadend.org/projects/tvheadend
 PKG_URL:=		https://tvheadend.org/projects/tvheadend
 PKG_SITES:=		https://github.com/tvheadend/tvheadend.git
 PKG_SITES:=		https://github.com/tvheadend/tvheadend.git
 
 
+PKG_CHOICES_TVHEADEND:=	WITH_LIBRESSL WITH_OPENSSL
+PKGCD_WITH_LIBRESSL:=	use libressl for crypto
+PKGCB_WITH_LIBRESSL:=	libressl
+PKGCS_WITH_LIBRESSL:=	libressl ca-certificates
+PKGCD_WITH_OPENSSL:=	use openssl for crypto
+PKGCB_WITH_OPENSSL:=	openssl
+PKGCS_WITH_OPENSSL:=	libopenssl ca-certificates
+
 include $(ADK_TOPDIR)/mk/package.mk
 include $(ADK_TOPDIR)/mk/package.mk
 
 
 $(eval $(call PKG_template,TVHEADEND,tvheadend,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION)))
 $(eval $(call PKG_template,TVHEADEND,tvheadend,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION)))

+ 0 - 81
package/u-boot-git/Makefile

@@ -1,81 +0,0 @@
-# This file is part of the OpenADK project. OpenADK is copyrighted
-# material, please see the LICENCE file in the top-level directory.
-
-include $(ADK_TOPDIR)/rules.mk
-
-PKG_NAME:=		u-boot-git
-PKG_VERSION:=		3bfe3ce2a6e3b04da1d04dbc0520dcc26e17f98a
-PKG_RELEASE:=		2
-PKG_DESCR:=		portable bootloader
-PKG_SECTION:=		base/boot
-HOST_BUILDDEP:=		openssl-host device-tree-compiler-host
-PKG_BUILDDEP:=		u-boot-git-host
-PKG_URL:=		http://www.denx.de/wiki/U-Boot	
-PKG_SITES:=		git://git.denx.de/u-boot.git
-
-PKG_SYSTEM_DEPENDS:=	raspberry-pi raspberry-pi2 atmel-ngw100
-
-include $(ADK_TOPDIR)/mk/host.mk
-include $(ADK_TOPDIR)/mk/package.mk
-
-$(eval $(call HOST_template,U_BOOT_GIT,u-boot-git,$(PKG_VERSION)-$(PKG_RELEASE)))
-$(eval $(call PKG_template,U_BOOT_GIT,u-boot-git,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION)))
-
-UBOOT:=			u-boot.bin
-ifeq ($(ADK_TARGET_SYSTEM_RASPBERRY_PI),y)
-CONFIG:=		rpi_defconfig
-endif
-ifeq ($(ADK_TARGET_SYSTEM_RASPBERRY_PI2),y)
-CONFIG:=		rpi_defconfig
-endif
-ifeq ($(ADK_TARGET_SYSTEM_ATMEL_NGW100),y)
-CONFIG:=		atngw100_defconfig
-endif
-ifeq ($(ADK_TARGET_SYSTEM_BANANA_PRO),y)
-CONFIG:=		Bananapro_defconfig
-UBOOT:=			u-boot-sunxi-with-spl.bin
-endif
-
-HOST_MAKE_FLAGS+=	HOSTCFLAGS="$(HOST_CPPFLAGS) $(HOST_CFLAGS)" \
-			HOSTLDFLAGS="$(HOST_LDFLAGS) -ldl"
-HOST_STYLE:=		manual
-CONFIG_STYLE:=		manual
-BUILD_STYLE:=		manual
-INSTALL_STYLE:=		manual
-
-host-build:
-	(cd $(WRKBUILD) && env $(HOST_MAKE_ENV) $(MAKE) -f $(MAKE_FILE) \
-		$(HOST_MAKE_FLAGS) sandbox_defconfig )
-	(cd $(WRKBUILD) && env $(HOST_MAKE_ENV) $(MAKE) -f $(MAKE_FILE) \
-		$(HOST_MAKE_FLAGS) tools $(MAKE_TRACE) )
-
-u-boot-git-hostinstall:
-	$(INSTALL_BIN) $(WRKBUILD)/tools/mk{,env}image \
-		$(STAGING_HOST_DIR)/usr/bin
-
-do-configure:
-	(cd $(WRKBUILD) && $(MAKE) $(CONFIG))
-
-do-build:
-	(cd $(WRKBUILD) && env \
-		PATH='$(HOST_PATH)' \
-		CROSS_COMPILE='$(TARGET_CROSS)' \
-		GCC_HONOUR_COPTS=s $(MAKE))
-	#(cd $(WRKBUILD) && env CROSS_COMPILE='$(TARGET_CROSS)' \
-	#	GCC_HONOUR_COPTS=s $(MAKE) env)
-
-u-boot-git-install:
-	$(CP) $(WRKBUILD)/$(UBOOT) $(FW_DIR)
-	$(INSTALL_DIR) $(IDIR_U_BOOT_GIT)/etc
-	#$(INSTALL_DIR) $(IDIR_U_BOOT_GIT)/boot
-	$(CP) ./files/fw_env.config $(IDIR_U_BOOT_GIT)/etc
-	$(INSTALL_DIR) $(IDIR_U_BOOT_GIT)/usr/bin
-	#$(INSTALL_BIN) $(WRKBUILD)/tools/env/fw_printenv \
-	#	$(IDIR_U_BOOT_GIT)/usr/bin
-	#(cd $(IDIR_U_BOOT_GIT)/usr/bin && ln -sf fw_printenv fw_setenv)
-	#$(INSTALL_BIN) ./files/uboot_print_env $(IDIR_U_BOOT_GIT)/usr/bin
-	#$(INSTALL_BIN) ./files/uboot_set_env $(IDIR_U_BOOT_GIT)/usr/bin
-	$(INSTALL_BIN) ./files/boot.script.bpi $(FW_DIR)
-
-include $(ADK_TOPDIR)/mk/host-bottom.mk
-include $(ADK_TOPDIR)/mk/pkg-bottom.mk

+ 0 - 5
package/u-boot-git/files/boot.script.bpi

@@ -1,5 +0,0 @@
-setenv bootargs 'console=ttyS0  root=/dev/mmcblk0p1'
-ext4load mmc 0 0x43000000 boot/kernel
-ext4load mmc 0 0x48000000 boot/sun7i-a20-bananapro.dtb
-printenv
-bootz 0x43000000 - 0x48000000

+ 0 - 1
package/u-boot-git/files/fw_env.config

@@ -1 +0,0 @@
-/mnt/uboot.env      0x0000          0x4000

+ 0 - 5
package/u-boot-git/files/uboot_print_env

@@ -1,5 +0,0 @@
-#!/bin/sh
-
-mount -r /dev/mmcblk0p1 /mnt
-fw_printenv "$@"
-umount /mnt

+ 0 - 5
package/u-boot-git/files/uboot_set_env

@@ -1,5 +0,0 @@
-#!/bin/sh
-
-mount /dev/mmcblk0p1 /mnt
-fw_setenv "$@"
-umount /mnt

+ 0 - 10
package/u-boot-git/patches/patch-common_image_c

@@ -1,10 +0,0 @@
---- u-boot-git-3bfe3ce2a6e3b04da1d04dbc0520dcc26e17f98a.orig/common/image.c	2015-05-22 17:03:30.000000000 -0500
-+++ u-boot-git-3bfe3ce2a6e3b04da1d04dbc0520dcc26e17f98a/common/image.c	2015-05-22 18:14:50.658865101 -0500
-@@ -87,6 +87,7 @@ static const table_entry_t uimage_arch[]
- 	{	IH_ARCH_ARM64,		"arm64",	"AArch64",	},
- 	{	IH_ARCH_ARC,		"arc",		"ARC",		},
- 	{	IH_ARCH_X86_64,		"x86_64",	"AMD x86_64",	},
-+	{	IH_ARCH_XTENSA,		"xtensa",	"Xtensa",	},
- 	{	-1,			"",		"",		},
- };
- 

+ 0 - 10
package/u-boot-git/patches/patch-include_image_h

@@ -1,10 +0,0 @@
---- u-boot-git-3bfe3ce2a6e3b04da1d04dbc0520dcc26e17f98a.orig/include/image.h	2015-05-22 17:03:31.000000000 -0500
-+++ u-boot-git-3bfe3ce2a6e3b04da1d04dbc0520dcc26e17f98a/include/image.h	2015-05-22 17:33:55.950887553 -0500
-@@ -182,6 +182,7 @@ struct lmb;
- #define IH_ARCH_ARM64		22	/* ARM64	*/
- #define IH_ARCH_ARC		23	/* Synopsys DesignWare ARC */
- #define IH_ARCH_X86_64		24	/* AMD x86_64, Intel and Via */
-+#define IH_ARCH_XTENSA		25	/* Xtensa */
- 
- /*
-  * Image Types

+ 0 - 11
package/u-boot-git/patches/patch-tools_Makefile

@@ -1,11 +0,0 @@
---- u-boot-git-3bfe3ce2a6e3b04da1d04dbc0520dcc26e17f98a.orig/tools/Makefile	2015-05-27 15:07:12.000000000 +0200
-+++ u-boot-git-3bfe3ce2a6e3b04da1d04dbc0520dcc26e17f98a/tools/Makefile	2015-05-27 20:09:17.000000000 +0200
-@@ -122,7 +122,7 @@ endif
- 
- # MXSImage needs LibSSL
- ifneq ($(CONFIG_MX23)$(CONFIG_MX28)$(CONFIG_FIT_SIGNATURE),)
--HOSTLOADLIBES_mkimage += -lssl -lcrypto
-+HOSTLOADLIBES_mkimage += -lssl -lcrypto -ldl
- endif
- 
- HOSTLOADLIBES_dumpimage := $(HOSTLOADLIBES_mkimage)

+ 1 - 0
package/u-boot-xtensa/Makefile

@@ -5,6 +5,7 @@ include $(ADK_TOPDIR)/rules.mk
 
 
 PKG_NAME:=		u-boot-xtensa
 PKG_NAME:=		u-boot-xtensa
 PKG_VERSION:=		fe85520cfb23b815207fa1a0ad840ec795eecedf
 PKG_VERSION:=		fe85520cfb23b815207fa1a0ad840ec795eecedf
+PKG_GIT:=		hash
 PKG_RELEASE:=		1
 PKG_RELEASE:=		1
 PKG_DESCR:=		portable bootloader
 PKG_DESCR:=		portable bootloader
 PKG_SECTION:=		base/boot
 PKG_SECTION:=		base/boot

+ 1 - 1
package/wiringPi/Makefile

@@ -5,10 +5,10 @@ include $(ADK_TOPDIR)/rules.mk
 
 
 PKG_NAME:=		wiringPi
 PKG_NAME:=		wiringPi
 PKG_VERSION:=		72b2af231be337d45a557ce6ca3ed1eeb6675ffd
 PKG_VERSION:=		72b2af231be337d45a557ce6ca3ed1eeb6675ffd
+PKG_GIT:=		hash
 PKG_RELEASE:=		2
 PKG_RELEASE:=		2
 PKG_DESCR:=		gpio access library for the raspberry pi
 PKG_DESCR:=		gpio access library for the raspberry pi
 PKG_SECTION:=		libs/misc
 PKG_SECTION:=		libs/misc
-PKG_HASH:=		ddc71b86f71e7e5104a89f88a68bea20122b6ea9f8c535219d180bf89502a69d
 PKG_NEEDS:=		threads
 PKG_NEEDS:=		threads
 PKG_URL:=		http://wiringpi.com/
 PKG_URL:=		http://wiringpi.com/
 PKG_SITES:=		git://git.drogon.net/wiringPi
 PKG_SITES:=		git://git.drogon.net/wiringPi

+ 1 - 0
package/xf86-video-intel/Makefile

@@ -5,6 +5,7 @@ include $(ADK_TOPDIR)/rules.mk
 
 
 PKG_NAME:=		xf86-video-intel
 PKG_NAME:=		xf86-video-intel
 PKG_VERSION:=		82293901da23d79fd074e5255fda5c95405d52de
 PKG_VERSION:=		82293901da23d79fd074e5255fda5c95405d52de
+PKG_GIT:=		hash
 PKG_RELEASE:=		1
 PKG_RELEASE:=		1
 PKG_HASH:=		b30dfa89f26f0f88c561f615d3c260d57bc095870d77b4ee565263c31bc52ce0
 PKG_HASH:=		b30dfa89f26f0f88c561f615d3c260d57bc095870d77b4ee565263c31bc52ce0
 PKG_DESCR:=		x11 driver for intel vga chips
 PKG_DESCR:=		x11 driver for intel vga chips

+ 1 - 0
package/ympd/Makefile

@@ -5,6 +5,7 @@ include $(ADK_TOPDIR)/rules.mk
 
 
 PKG_NAME:=		ympd
 PKG_NAME:=		ympd
 PKG_VERSION:=		3df5b36b97b7a5b0c9adeba39b9987d9aa58a7fb
 PKG_VERSION:=		3df5b36b97b7a5b0c9adeba39b9987d9aa58a7fb
+PKG_GIT:=		hash
 PKG_RELEASE:=		1
 PKG_RELEASE:=		1
 PKG_DESCR:=		standalone music player daemon web gui
 PKG_DESCR:=		standalone music player daemon web gui
 PKG_SECTION:=		net/http
 PKG_SECTION:=		net/http

+ 14 - 1
scripts/prereq.sh

@@ -292,6 +292,16 @@ if ! which gzip >/dev/null 2>&1; then
 fi
 fi
 printf "found\n"
 printf "found\n"
 
 
+printf " --->  checking if git is installed.. "
+if ! which git >/dev/null 2>&1; then
+  echo You must install git to continue.
+  echo
+  out=1
+  printf "not found\n"
+fi
+printf "found\n"
+
+
 # creating prereq.mk
 # creating prereq.mk
 echo "ADK_TOPDIR:=$(readlink -nf . 2>/dev/null || pwd -P)" > $topdir/prereq.mk
 echo "ADK_TOPDIR:=$(readlink -nf . 2>/dev/null || pwd -P)" > $topdir/prereq.mk
 echo "BASH:=$(which bash)" >> $topdir/prereq.mk
 echo "BASH:=$(which bash)" >> $topdir/prereq.mk
@@ -333,7 +343,10 @@ echo 'LC_ALL:=C' >> $topdir/prereq.mk
 echo "_PATH:=$PATH" >> $topdir/prereq.mk
 echo "_PATH:=$PATH" >> $topdir/prereq.mk
 echo "PATH:=${topdir}/scripts:/usr/sbin:$PATH" >> $topdir/prereq.mk
 echo "PATH:=${topdir}/scripts:/usr/sbin:$PATH" >> $topdir/prereq.mk
 echo "GIT:=$(which git 2>/dev/null)" >> $topdir/prereq.mk
 echo "GIT:=$(which git 2>/dev/null)" >> $topdir/prereq.mk
-echo "export ADK_TOPDIR GIT SHA256 BASH SHELL" >> $topdir/prereq.mk
+if [ $dlverbose -eq 0 ]; then
+  echo "GITOPTS:=--quiet" >> $topdir/prereq.mk
+fi
+echo "export ADK_TOPDIR GIT GITOPTS SHA256 BASH SHELL" >> $topdir/prereq.mk
 
 
 # create temporary Makefile
 # create temporary Makefile
 cat >Makefile.tmp <<'EOF'
 cat >Makefile.tmp <<'EOF'