diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2009-09-30 19:03:23 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2009-09-30 19:03:23 +0200 |
| commit | 7f46305c0aa9963be7b87489d52876916c8643e0 (patch) | |
| tree | d54bd4030d9ce79e3bda493f19ac48038b55430d | |
| parent | 01f827482883432131c465a8e7c2586b18cbb167 (diff) | |
fix tool dependency list add preliminary rpm backend support
| -rw-r--r-- | README | 4 | ||||
| -rw-r--r-- | package/eglibc/Makefile | 1 | ||||
| -rw-r--r-- | scripts/scan-pkgs.sh | 11 | ||||
| -rw-r--r-- | scripts/scan-tools.sh | 32 | ||||
| -rw-r--r-- | target/Config.in | 10 |
5 files changed, 21 insertions, 37 deletions
@@ -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/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 69f2b1e3a..ad265d457 100644 --- a/scripts/scan-pkgs.sh +++ b/scripts/scan-pkgs.sh @@ -23,6 +23,10 @@ out=0 . $topdir/.config +if [[ -n $ADK_TARGET_PACKAGE_RPM ]]; then + NEED_RPM="$NEED_RPM rpm" +fi + if [[ -n $ADK_PACKAGE_ALSA_UTILS ]]; then NEED_XMLTO="$NEED_XMLTO alsa-utils" fi @@ -111,6 +115,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 |