From 4f157056c307ae7d5d0cbd4fa35ffeb2916cd2e0 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Sat, 15 Feb 2014 15:52:29 +0100
Subject: more Darwin compat fixes, add java as build dependency check for xbmc

---
 scripts/scan-pkgs.sh | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

(limited to 'scripts')

diff --git a/scripts/scan-pkgs.sh b/scripts/scan-pkgs.sh
index 79d416569..1ff957c25 100644
--- a/scripts/scan-pkgs.sh
+++ b/scripts/scan-pkgs.sh
@@ -61,6 +61,10 @@ if [[ -n $ADK_NATIVE ]];then
 	fi
 fi
 
+if [[ -n $ADK_PACKAGE_XBMC ]]; then
+	NEED_JAVA="$NEED_JAVA xbmc"
+fi
+
 if [[ -n $ADK_PACKAGE_XKEYBOARD_CONFIG ]]; then
 	NEED_XKBCOMP="$NEED_XKBCOMP xkeyboard-config"
 fi
@@ -78,7 +82,6 @@ if [[ -n $ADK_PACKAGE_XKEYBOARD_CONFIG ]]; then
 fi
 
 if [[ -n $ADK_PACKAGE_LIBXFONT ]]; then
-	NEED_WWW="$NEED_WWW libXfont"
 	NEED_XMLTO="$NEED_XMLTO libXfont"
 fi
 
@@ -258,6 +261,13 @@ if [[ -n $NEED_DBUSGLIB ]]; then
 	fi
 fi
 
+if [[ -n $NEED_JAVA ]]; then
+	if ! which java >/dev/null 2>&1; then
+		echo >&2 You need java to build $NEED_JAVA
+		out=1
+	fi
+fi
+
 if [[ -n $ADK_USE_CCACHE ]]; then
         if ! which ccache >/dev/null 2>&1; then
                 echo >&2 You have selected to build with ccache, but ccache could not be found.
-- 
cgit v1.2.3


From 1c2490cf2b6382a448c8b854a9040636e6c2d38b Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Sun, 16 Feb 2014 11:18:55 +0100
Subject: add boot section

---
 package/grub-bin/Makefile | 2 +-
 package/grub/Makefile     | 2 +-
 package/section.lst       | 3 ++-
 scripts/ipkg-build        | 2 +-
 tools/adk/pkgmaker.c      | 2 +-
 5 files changed, 6 insertions(+), 5 deletions(-)

(limited to 'scripts')

diff --git a/package/grub-bin/Makefile b/package/grub-bin/Makefile
index b767e616a..7b52cdafa 100644
--- a/package/grub-bin/Makefile
+++ b/package/grub-bin/Makefile
@@ -10,7 +10,7 @@ PKG_VERSION:=		1.98
 PKG_RELEASE:=		2
 PKG_MD5SUM:=		50dbe739776f904c318be05faf1d7ce5
 PKG_DESCR:=		GRUB2 bootloader (binary package)
-PKG_SECTION:=		base
+PKG_SECTION:=		boot
 PKG_SITES:=		http://openadk.org/distfiles/
 PKG_URL:=		http://www.gnu.org/software/grub
 
diff --git a/package/grub/Makefile b/package/grub/Makefile
index 4b429c786..cfe17a227 100644
--- a/package/grub/Makefile
+++ b/package/grub/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:=		1.98
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		c0bcf60e524739bb64e3a2d4e3732a59
 PKG_DESCR:=		GRUB2 bootloader (source package)
-PKG_SECTION:=		base
+PKG_SECTION:=		boot
 PKG_URL:=		http://www.gnu.org/software/grub
 PKG_SITES:=		ftp://alpha.gnu.org/gnu/grub/
 
diff --git a/package/section.lst b/package/section.lst
index 795840988..9476cb44d 100644
--- a/package/section.lst
+++ b/package/section.lst
@@ -1,4 +1,5 @@
 base	Base System
+boot	Boot Loaders
 browser	Browser / Editor / Pager
 editor	Browser / Editor / Pager
 pager	Browser / Editor / Pager
@@ -21,7 +22,7 @@ lang	Programming / Languages
 libs	Libraries
 mail	Mail
 misc	Misc
-multimedia	Multimedia
+multimedia	Multimedia / Audio / Video
 net	Networking
 net/fs	Network Filesystems
 net/misc	Networking Misc
diff --git a/scripts/ipkg-build b/scripts/ipkg-build
index 47158c409..22600e8e0 100644
--- a/scripts/ipkg-build
+++ b/scripts/ipkg-build
@@ -82,7 +82,7 @@ You probably want to remove them: " >&2
 	[ "$?" -ne 0 ] && PKG_ERROR=1
 	if [ -z "$section" ]; then
 	    echo "The Section field should have one of the following values:" >&2
-	    echo "admin, base, comm, editors, extras, games, graphics, kernel, lang, libs, misc, net, scm, text, web, x11" >&2
+	    echo "admin, base, boot, comm, editors, extras, games, graphics, kernel, lang, libs, misc, net, scm, text, web, x11" >&2
 	fi
 
 	priority=`required_field Priority`
diff --git a/tools/adk/pkgmaker.c b/tools/adk/pkgmaker.c
index 3609691b6..d2c444f4f 100644
--- a/tools/adk/pkgmaker.c
+++ b/tools/adk/pkgmaker.c
@@ -33,7 +33,7 @@
 #define MAXVALUE 168
 #define MAXVAR 	64
 #define MAXPATH 320
-#define HASHSZ	32
+#define HASHSZ	96
 
 static int nobinpkgs;
 
-- 
cgit v1.2.3