summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2014-03-31 08:34:10 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2014-03-31 08:34:10 +0200
commitcb9fe14b5d677e89ed10ed70f1241932219f1fc6 (patch)
tree9b86656b2ebcb8e204891fd7ede0ba39e0ce9bdf
parent77dd9c466922fad94a8514f071a4bc87fc2ed0a9 (diff)
parent5ef2d4473e58df0f12f804a691094d70c3f13ad1 (diff)
Merge branch 'master' of git+ssh://openadk.org/git/openadk
-rw-r--r--mk/build.mk2
-rw-r--r--mk/host.mk2
-rw-r--r--mk/pkg-bottom.mk4
-rw-r--r--mk/vars.mk1
-rw-r--r--package/adk-helper/Makefile (renamed from package/mkcrypt/Makefile)10
-rw-r--r--package/adk-helper/src/dkgetsz.c (renamed from adk/tools/dkgetsz.c)0
-rw-r--r--package/adk-helper/src/mkcrypt.c (renamed from package/mkcrypt/src/mkcrypt.c)0
-rw-r--r--package/pixman/Makefile8
-rw-r--r--package/pixman/patches/patch-Makefile_in11
-rw-r--r--scripts/scan-tools.sh7
-rw-r--r--target/config/Config.in.tools2
11 files changed, 33 insertions, 14 deletions
diff --git a/mk/build.mk b/mk/build.mk
index c13ba95b4..78079bea9 100644
--- a/mk/build.mk
+++ b/mk/build.mk
@@ -146,7 +146,7 @@ ${TOPDIR}/package/Depends.mk: ${TOPDIR}/.config $(wildcard ${TOPDIR}/package/*/M
.PHONY: all world clean cleandir cleantoolchain distclean image_clean
world:
- mkdir -p $(DL_DIR) $(BUILD_DIR) $(TARGET_DIR) $(FW_DIR) \
+ mkdir -p $(DL_DIR) $(HOST_BUILD_DIR) $(BUILD_DIR) $(TARGET_DIR) $(FW_DIR) \
$(STAGING_HOST_DIR) $(TOOLCHAIN_BUILD_DIR) $(STAGING_PKG_DIR)/stamps
${BASH} ${TOPDIR}/scripts/scan-pkgs.sh
${BASH} ${TOPDIR}/scripts/update-sys
diff --git a/mk/host.mk b/mk/host.mk
index 8d3e7d74e..88f8d2e01 100644
--- a/mk/host.mk
+++ b/mk/host.mk
@@ -3,7 +3,7 @@
# This is where all package operation is done in
ifneq (,$(findstring host,$(MAKECMDGOALS)))
-WRKDIR?= ${WRKDIR_BASE}/w-${PKG_NAME}-${PKG_VERSION}-${PKG_RELEASE}-host
+WRKDIR?= ${HOST_BUILD_DIR}/w-${PKG_NAME}-${PKG_VERSION}-${PKG_RELEASE}-host
endif
HOST_CONFIGURE_ENV+= AUTOM4TE=${STAGING_HOST_DIR}/usr/bin/autom4te \
diff --git a/mk/pkg-bottom.mk b/mk/pkg-bottom.mk
index 2cec6ac2c..2ccc6ff1e 100644
--- a/mk/pkg-bottom.mk
+++ b/mk/pkg-bottom.mk
@@ -125,8 +125,6 @@ do-install:
post-install:
spkg-install: ${ALL_POSTINST}
${_FAKE_COOKIE}: ${_BUILD_COOKIE}
- echo FOO
- echo $(HOST_WRKDIR)
@-rm -f ${_ALL_CONTROLS}
@mkdir -p '${STAGING_PKG_DIR}/stamps' ${WRKINST} '${STAGING_TARGET_DIR}/scripts'
@${MAKE} ${_ALL_CONTROLS} $(MAKE_TRACE)
@@ -186,7 +184,7 @@ ifneq (,$(filter dev,${PKG_OPTS}))
done
endif
@-cd ${WRKINST}; \
- if [ "${PKG_NAME}" != "uClibc" -a "${PKG_NAME}" != "glibc" -a "${PKG_NAME}" != "libpthread" -a "${PKG_NAME}" != "libstdcxx" -a "${PKG_NAME}" != "libgcc" -a "${PKG_NAME}" != "libthread-db" -a "${PKG_NAME}" != "musl" -a "${PKG_NAME}" != "pam" ];then \
+ if [ "${PKG_NAME}" != "uClibc" -a "${PKG_NAME}" != "glibc" -a "${PKG_NAME}" != "libpthread" -a "${PKG_NAME}" != "libstdcxx" -a "${PKG_NAME}" != "libgcc" -a "${PKG_NAME}" != "libthread-db" -a "${PKG_NAME}" != "musl" -a "${PKG_NAME}" != "pam" -a "${PKG_NAME}" != "tzdata" ];then \
find lib \( -name lib\*.so\* -o -name lib\*.a \) \
-exec echo 'WARNING: ${PKG_NAME} installs files in /lib -' \
' fix this!' >&2 \; -quit 2>/dev/null; fi;\
diff --git a/mk/vars.mk b/mk/vars.mk
index 3cf0a9344..e6fe41946 100644
--- a/mk/vars.mk
+++ b/mk/vars.mk
@@ -20,6 +20,7 @@ endif
SCRIPT_DIR:= $(BASE_DIR)/scripts
STAGING_HOST_DIR:= ${BASE_DIR}/host_${GNU_HOST_NAME}
TOOLCHAIN_DIR:= ${BASE_DIR}/toolchain_${GNU_HOST_NAME}
+HOST_BUILD_DIR:= ${BASE_DIR}/host_build_${GNU_HOST_NAME}
# dirs for cleandir
FW_DIR_PFX:= $(BASE_DIR)/firmware
diff --git a/package/mkcrypt/Makefile b/package/adk-helper/Makefile
index 6f8f873a7..7d0ccb202 100644
--- a/package/mkcrypt/Makefile
+++ b/package/adk-helper/Makefile
@@ -3,10 +3,10 @@
include ${TOPDIR}/rules.mk
-PKG_NAME:= mkcrypt
+PKG_NAME:= adk-helper
PKG_VERSION:= 1.0
PKG_RELEASE:= 1
-PKG_DESCR:= mkcrypt utility
+PKG_DESCR:= adk helper utilities
PKG_SECTION:= misc
PKG_CFLINE_MKCRYPT:= depends on ADK_HOST_ONLY
@@ -16,16 +16,18 @@ NO_DISTFILES:= 1
include ${TOPDIR}/mk/host.mk
include ${TOPDIR}/mk/package.mk
-$(eval $(call HOST_template,MKCRYPT,mkcrypt,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call HOST_template,ADK_HELPER,adk-helper,${PKG_VERSION}-${PKG_RELEASE}))
HOST_STYLE:= manual
host-build:
$(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) -o ${WRKBUILD}/mkcrypt ${WRKBUILD}/mkcrypt.c
+ $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) -o ${WRKBUILD}/dkgetsz ${WRKBUILD}/dkgetsz.c
-mkcrypt-hostinstall:
+adk-helper-hostinstall:
${INSTALL_DIR} ${STAGING_HOST_DIR}/usr/bin
${INSTALL_BIN} ${WRKBUILD}/mkcrypt ${STAGING_HOST_DIR}/usr/bin
+ ${INSTALL_BIN} ${WRKBUILD}/dkgetsz ${STAGING_HOST_DIR}/usr/bin
include ${TOPDIR}/mk/host-bottom.mk
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/adk/tools/dkgetsz.c b/package/adk-helper/src/dkgetsz.c
index b8315be70..b8315be70 100644
--- a/adk/tools/dkgetsz.c
+++ b/package/adk-helper/src/dkgetsz.c
diff --git a/package/mkcrypt/src/mkcrypt.c b/package/adk-helper/src/mkcrypt.c
index a856759df..a856759df 100644
--- a/package/mkcrypt/src/mkcrypt.c
+++ b/package/adk-helper/src/mkcrypt.c
diff --git a/package/pixman/Makefile b/package/pixman/Makefile
index 5cb1821d9..6d5cd5aec 100644
--- a/package/pixman/Makefile
+++ b/package/pixman/Makefile
@@ -4,10 +4,10 @@
include $(TOPDIR)/rules.mk
PKG_NAME:= pixman
-PKG_VERSION:= 0.30.0
-PKG_RELEASE:= 2
-PKG_MD5SUM:= ae7ac97921dfa59086ca2231621a79c7
-PKG_DESCR:= Pixel manipulation library
+PKG_VERSION:= 0.32.4
+PKG_RELEASE:= 1
+PKG_MD5SUM:= eba449138b972fbf4547a8c152fea162
+PKG_DESCR:= pixel manipulation library
PKG_SECTION:= x11/libs
PKG_BUILDDEP:= libpng
PKG_SITES:= http://www.cairographics.org/releases/
diff --git a/package/pixman/patches/patch-Makefile_in b/package/pixman/patches/patch-Makefile_in
new file mode 100644
index 000000000..cebc19113
--- /dev/null
+++ b/package/pixman/patches/patch-Makefile_in
@@ -0,0 +1,11 @@
+--- pixman-0.32.4.orig/Makefile.in 2013-11-18 03:11:20.000000000 +0100
++++ pixman-0.32.4/Makefile.in 2014-03-30 21:54:18.000000000 +0200
+@@ -369,7 +369,7 @@ target_alias = @target_alias@
+ top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+-SUBDIRS = pixman demos test
++SUBDIRS = pixman
+ pkgconfigdir = $(libdir)/pkgconfig
+ pkgconfig_DATA = pixman-1.pc
+ GPGKEY = 3892336E
diff --git a/scripts/scan-tools.sh b/scripts/scan-tools.sh
index 6f365cd13..16b13d4e3 100644
--- a/scripts/scan-tools.sh
+++ b/scripts/scan-tools.sh
@@ -277,6 +277,12 @@ if ! which ccache >/dev/null 2>&1; then
host_build_ccache=1
fi
+host_build_genext2fs=0
+if ! which genext2fs >/dev/null 2>&1; then
+ echo "No genext2fs found, will build one when required."
+ host_build_genext2fs=1
+fi
+
host_build_lzma=0
if ! which lzma >/dev/null 2>&1; then
echo "No lzma found, will build one when required."
@@ -305,6 +311,7 @@ if [ $host_build_findutils -eq 1 ];then printf "\t%s\n" "select ADK_HOST_BUILD_F
if [ $host_build_xz -eq 1 ];then printf "\t%s\n" "select ADK_HOST_BUILD_XZ" >> $topdir/target/config/Config.in.prereq ;fi
# optional
if [ $host_build_ccache -eq 1 ];then printf "\t%s\n" "select ADK_HOST_BUILD_CCACHE if ADK_HOST_NEED_CCACHE" >> $topdir/target/config/Config.in.prereq ;fi
+if [ $host_build_genext2fs -eq 1 ];then printf "\t%s\n" "select ADK_HOST_BUILD_GENEXT2FS if ADK_HOST_NEED_GENEXT2FS" >> $topdir/target/config/Config.in.prereq ;fi
if [ $host_build_lzma -eq 1 ];then printf "\t%s\n" "select ADK_HOST_BUILD_LZMA if ADK_HOST_NEED_LZMA" >> $topdir/target/config/Config.in.prereq ;fi
if [ $host_build_lzop -eq 1 ];then printf "\t%s\n" "select ADK_HOST_BUILD_LZOP if ADK_HOST_NEED_LZOP" >> $topdir/target/config/Config.in.prereq ;fi
diff --git a/target/config/Config.in.tools b/target/config/Config.in.tools
index 92bbae9d6..2159b4db7 100644
--- a/target/config/Config.in.tools
+++ b/target/config/Config.in.tools
@@ -3,7 +3,7 @@ config ADK_HOST_BUILD_HEIRLOOM_CPIO
boolean
default y
-config ADK_HOST_BUILD_MKCRYPT
+config ADK_HOST_BUILD_ADK_HELPER
boolean
default y