diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2011-11-17 12:51:22 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-11-17 12:51:22 +0100 |
| commit | 9f02979caebb6e900fe101a257d8e6c344a7a173 (patch) | |
| tree | 350b808ae23e8abb4ff08d472b76104a89e1f35a /mk | |
| parent | afb9908771db100ee97bb933fcca850c4f49af5a (diff) | |
| parent | ee3c54b1570b9dd8ea900a11d496ced1ad1ae356 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/build.mk | 14 | ||||
| -rw-r--r-- | mk/kernel-ver.mk | 12 | ||||
| -rw-r--r-- | mk/python.mk | 5 | ||||
| -rw-r--r-- | mk/vars.mk | 2 |
4 files changed, 25 insertions, 8 deletions
diff --git a/mk/build.mk b/mk/build.mk index 886ecaf09..dc79691af 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -18,10 +18,18 @@ DEFCONFIG= ADK_DEBUG=n \ ADK_USE_CCACHE=n \ ADK_PACKAGE_LIBFFMPEG_WITH_VP8=n \ ADK_PACKAGE_LM_SENSORS_DETECT=n \ + ADK_PACKAGE_PACEMAKER_MGMTD=n \ + ADK_PACKAGE_OPENJDK=n \ + ADK_PACKAGE_CLASSPATH=n \ + ADK_PACKAGE_PCMANFM=n \ + ADK_PACKAGE_GPSD=n \ + ADK_PACKAGE_GPSD_CLIENTS=n \ ADK_PACKAGE_GRUB=n \ ADK_PACKAGE_BASE_FILES=y \ ADK_PACKAGE_CRYPTINIT=n \ ADK_PACKAGE_PYTHON=n \ + ADK_PACKAGE_VIRTINST=n \ + ADK_PACKAGE_URLGRABBER=n \ ADK_PACKAGE_PERL=n \ ADK_PKG_LAPTOP=n \ ADK_PKG_DEVELOPMENT=n \ @@ -34,6 +42,8 @@ DEFCONFIG= ADK_DEBUG=n \ BUSYBOX_INSTALL_NO_USR=n \ BUSYBOX_MODPROBE_SMALL=n \ BUSYBOX_EJECT=n \ + BUSYBOX_UBIDETACH=n \ + BUSYBOX_UBIATTACH=n \ BUSYBOX_BUILD_LIBBUSYBOX=n \ BUSYBOX_FEATURE_2_4_MODULES=n \ BUSYBOX_LOCALE_SUPPORT=n \ @@ -96,7 +106,7 @@ POSTCONFIG= -@\ rebuild=1;\ fi; \ if [ "$$(grep ^ADK_KERNEL_VERSION .config|md5sum)" != "$$(grep ^ADK_KERNEL_VERSION .config.old|md5sum)" ];then \ - make cleankernel ;\ + make kernelclean;\ fi; \ if [ $$rebuild -eq 1 ];then \ cp .config .config.old;\ @@ -271,7 +281,7 @@ ifeq ($(filter-out distclean,${MAKECMDGOALS}),) include ${TOPDIR}/mk/vars.mk else include $(TOPDIR)/prereq.mk -export BASH MAKE LANGUAGE LC_ALL OStype PATH CC_FOR_BUILD QEMU +export BASH MAKE LANGUAGE LC_ALL OStype PATH CC_FOR_BUILD QEMU SHELL endif all: menuconfig diff --git a/mk/kernel-ver.mk b/mk/kernel-ver.mk index 6a6202fbc..5b6a3d06f 100644 --- a/mk/kernel-ver.mk +++ b/mk/kernel-ver.mk @@ -1,10 +1,10 @@ -ifeq ($(ADK_KERNEL_VERSION_2_6_39),y) -KERNEL_VERSION:= 2.6.39 +ifeq ($(ADK_KERNEL_VERSION_2_6_39_4),y) +KERNEL_VERSION:= 2.6.39.4 KERNEL_RELEASE:= 1 -KERNEL_MD5SUM:= 1aab7a741abe08d42e8eccf20de61e05 +KERNEL_MD5SUM:= a17c748c2070168f1e784e9605ca043d endif -ifeq ($(ADK_KERNEL_VERSION_3_0_4),y) -KERNEL_VERSION:= 3.0.4 +ifeq ($(ADK_KERNEL_VERSION_3_0_8),y) +KERNEL_VERSION:= 3.0.8 KERNEL_RELEASE:= 1 -KERNEL_MD5SUM:= dff86c657cabe813bda84c72bfb93ae8 +KERNEL_MD5SUM:= eac4d398a0ecd98214487cd47a228998 endif diff --git a/mk/python.mk b/mk/python.mk index 5767b12f7..933bd0065 100644 --- a/mk/python.mk +++ b/mk/python.mk @@ -1,3 +1,8 @@ PYTHON_VERSION=2.7 +ifeq ($(ADK_NATIVE),) PYTHON_LIBDIR:=$(STAGING_HOST_DIR)/usr/lib PYTHON:=${STAGING_HOST_DIR}/usr/bin/hostpython +else +PYTHON_LIBDIR:=/usr/lib +PYTHON:=/usr/bin/python +endif diff --git a/mk/vars.mk b/mk/vars.mk index 896307026..bdfd333ad 100644 --- a/mk/vars.mk +++ b/mk/vars.mk @@ -135,6 +135,7 @@ check_gcc=$(shell \ CF_FOR_BUILD=$(call check_gcc,-fhonour-copts,) # host compiler flags +CXX_FOR_BUILD?= g++ CPPFLAGS_FOR_BUILD?= CFLAGS_FOR_BUILD= -O2 -Wall $(CF_FOR_BUILD) CXXFLAGS_FOR_BUILD?= -O2 -Wall @@ -165,6 +166,7 @@ TARGET_CONFIGURE_OPTS= PATH='${TARGET_PATH}' \ HOST_CONFIGURE_OPTS= CC_FOR_BUILD='${CC_FOR_BUILD}' \ CPPFLAGS_FOR_BUILD='${CPPFLAGS_FOR_BUILD}' \ + CXX_FOR_BUILD='${CXX_FOR_BUILD}' \ CFLAGS_FOR_BUILD='${CFLAGS_FOR_BUILD}' \ LDFLAGS_FOR_BUILD='${LDFLAGS_FOR_BUILD}' \ QEMU='$(QEMU)' |