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

Conflicts:
	scripts/scan-pkgs.sh

9 files changed, 20 insertions, 37 deletions

diff --git a/README b/README
index 6922cd085..c7c09f684 100644
--- a/README
+++ b/README
@@ -16,9 +16,6 @@ Before you can start you need to install some tools:
 - bzip2
 - cpio 
 - wget
-- flex
-- bison
-- gperf
 - file
 - unzip
 - autoconf
@@ -26,6 +23,7 @@ Before you can start you need to install some tools:
 - zlib-dev / libz-dev
 - libncurses5-dev
 - libc-dev
+- perl
 
 There is a check for the required versions of these tools in advance, though
 (to re-issue the checks, use "make prereq").
diff --git a/package/base-files/extra/etc/network/if-down.d/.empty b/package/base-files/extra/etc/network/if-down.d/.empty
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/package/base-files/extra/etc/network/if-down.d/.empty
diff --git a/package/base-files/extra/etc/network/if-post-down.d/.empty b/package/base-files/extra/etc/network/if-post-down.d/.empty
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/package/base-files/extra/etc/network/if-post-down.d/.empty
diff --git a/package/base-files/extra/etc/network/if-pre-up.d/.empty b/package/base-files/extra/etc/network/if-pre-up.d/.empty
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/package/base-files/extra/etc/network/if-pre-up.d/.empty
diff --git a/package/base-files/extra/etc/network/if-up.d/.empty b/package/base-files/extra/etc/network/if-up.d/.empty
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/package/base-files/extra/etc/network/if-up.d/.empty
diff --git a/package/eglibc/Makefile b/package/eglibc/Makefile
index ea271f4b6..3333f85dc 100644
--- a/package/eglibc/Makefile
+++ b/package/eglibc/Makefile
@@ -61,6 +61,7 @@ endif
 	cd $(IDIR_EGLIBC)/lib && ln -sf libm.so.6 libm.so
 	cd $(IDIR_EGLIBC)/lib && ln -sf libutil.so.1 libutil.so
 	cd $(IDIR_EGLIBC)/lib && ln -sf librt.so.1 librt.so
+	cd $(IDIR_EGLIBC)/lib && ln -sf libcrypt.so.1 libcrypt.so
 	# header package
 	$(MAKE) -C $(TOOLCHAIN_BUILD_DIR)/linux-$(KERNEL_VERSION) ARCH=$(ARCH) V=1 \
 		INSTALL_HDR_PATH=$(IDIR_EGLIBC_DEV)/usr \
diff --git a/scripts/scan-pkgs.sh b/scripts/scan-pkgs.sh
index 1faaeaeb8..0107ee4bd 100644
--- a/scripts/scan-pkgs.sh
+++ b/scripts/scan-pkgs.sh
@@ -28,6 +28,9 @@ if [[ -n $ADK_NATIVE ]];then
 		NEED_CURLDEV="$NEED_CURLDEV git"
 		NEED_SSLDEV="$NEED_SSLDEV git"
 	fi
+	if [[ -n $ADK_TARGET_PACKAGE_RPM ]]; then
+		NEED_RPM="$NEED_RPM rpm"
+	fi
 fi
 
 if [[ -n $ADK_PACKAGE_ALSA_UTILS ]]; then
@@ -125,6 +128,13 @@ if [[ -n $ADK_USE_CCACHE ]]; then
         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
+		out=1
+	fi
+fi
+
 #if [[ -n $ADK_COMPILE_MYSQL && $OStype != Linux ]]; then
 #	echo >&2 mySQL does not build on non-GNU/Linux.
 #	out=1
diff --git a/scripts/scan-tools.sh b/scripts/scan-tools.sh
index 29cdf0fef..d63391f66 100644
--- a/scripts/scan-tools.sh
+++ b/scripts/scan-tools.sh
@@ -107,38 +107,6 @@ if ! which cpp >/dev/null 2>&1; then
 	out=1
 fi
 
-#if ! which flex >/dev/null 2>&1; then
-#	echo You must install flex to continue.
-#	echo
-#	out=1
-#else
-#	echo '%%' | flex -
-#	if fgrep _POSIX_SOURCE lex.yy.c; then
-#		echo Your lexer \(flex\) contains a broken skeleton.
-#		if [[ $NO_ERROR = 1 ]]; then
-#			echo WARNING: continue at your own risk.
-#			echo Some packages may be broken.
-#		else
-#			echo You can continue the build by issuing \'make prereq-noerror\'
-#			echo However, several packages may faild to build correctly.
-#			out=1
-#		fi
-#		echo
-#	fi
-#fi
-
-#if ! which bison >/dev/null 2>&1; then
-#	echo You must install GNU bison to continue.
-#	echo
-#	out=1
-#fi
-
-#if ! which gperf >/dev/null 2>&1; then
-#	echo You must install gperf to continue.
-#	echo
-#	out=1
-#fi
-
 if ! which tar >/dev/null 2>&1; then
 	echo You must install GNU tar to continue.
 	echo
diff --git a/target/Config.in b/target/Config.in
index 2b7b3169c..6ee9430af 100644
--- a/target/Config.in
+++ b/target/Config.in
@@ -631,13 +631,19 @@ config ADK_TARGET_PACKAGE_IPKG
 	prompt "ipkg package format"
 	select BUSYBOX_IPKG
 	help
-	  Use ipkg package format.
+	  Create ipkg packages.
 
 config ADK_TARGET_PACKAGE_TGZ
 	boolean
 	prompt "gzip compressed tar archive"
 	help
-	  Use simple compressed tar archive.
+	  Create simple compressed tar archives.
+
+config ADK_TARGET_PACKAGE_RPM
+	boolean
+	prompt "rpm package format"
+	help
+	  Create rpm binary packages.
 
 endchoice