From fa330c259421fad6bd1968ece48f66cc90a171de Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Mon, 10 Jan 2011 13:45:47 +0100
Subject: fix some files, when someone moves the top directory

---
 scripts/reloc.sh | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100755 scripts/reloc.sh

(limited to 'scripts')

diff --git a/scripts/reloc.sh b/scripts/reloc.sh
new file mode 100755
index 000000000..f7a0a1e3b
--- /dev/null
+++ b/scripts/reloc.sh
@@ -0,0 +1,16 @@
+#!/usr/bin/env bash
+# execute this after relocation of adk directory
+
+olddir=$(grep "^TOPDIR" prereq.mk |cut -d '=' -f 2)
+newdir=$(pwd)
+
+if [ "$olddir" != "$newdir" ];then
+	echo "adk directory relocated!"
+	echo "old directory: $olddir"
+	echo "new directory: $newdir"
+	sed -i -e "s#$olddir#$newdir#g" $(find target_* -name \*.pc|xargs)
+	sed -i -e "s#$olddir#$newdir#g" $(find target_* -name \*.la|xargs)
+	sed -i -e "s#$olddir#$newdir#g" $(find target_*/scripts -type f|xargs)
+	sed -i -e "s#$olddir#$newdir#" target_*/etc/ipkg.conf
+	sed -i -e "s#$olddir#$newdir#" prereq.mk
+fi
-- 
cgit v1.2.3


From 6728f525e16bf83b4dfc374297b194ce2f1e29b0 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Wed, 12 Jan 2011 20:05:20 +0100
Subject: do not depend on host glib installation

---
 scripts/scan-pkgs.sh | 12 ------------
 1 file changed, 12 deletions(-)

(limited to 'scripts')

diff --git a/scripts/scan-pkgs.sh b/scripts/scan-pkgs.sh
index b08cafc95..a7b3cf492 100644
--- a/scripts/scan-pkgs.sh
+++ b/scripts/scan-pkgs.sh
@@ -85,11 +85,6 @@ if [[ -n $ADK_PACKAGE_XKEYBOARD_CONFIG ]]; then
 	NEED_INTL="$NEED_INTL xkeyboard-config"
 fi
 
-if [[ -n $ADK_PACKAGE_GLIB ]]; then
-	NEED_GLIBZWO="$NEED_GLIBZWO glib"
-	NEED_GETTEXT="$NEED_GETTEXT glib"
-fi
-
 if [[ -n $ADK_PACKAGE_LIBPCAP ]]; then
 	NEED_FLEX="$NEED_FLEX libpcap"
 	NEED_BISON="$NEED_BISON libpcap"
@@ -269,13 +264,6 @@ if [[ -n $NEED_XKBCOMP ]]; then
 	fi
 fi
 
-if [[ -n $NEED_GLIBZWO ]]; then
-	if ! which glib-genmarshal >/dev/null 2>&1; then
-		echo >&2 You need libglib2.0-dev to build $NEED_GLIBZWO
-		out=1
-	fi
-fi
-
 if [[ -n $NEED_RPM ]]; then
 	if ! which rpmbuild >/dev/null 2>&1; then
 		echo >&2 You need rpmbuild to to use $NEED_RPM package backend
-- 
cgit v1.2.3