diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-01-10 14:40:36 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-01-10 14:40:36 +0100 |
| commit | 435cff735f24278f53678abda61b950a4a478895 (patch) | |
| tree | 63ab1a8afc2764c7ce690d66bd843741acdedf25 /mk | |
| parent | 1ea04a0aae6381623d8908f3a21566ce39050cda (diff) | |
| parent | 6fee1b118039c804d2d18c500abf98798c8c04da (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/build.mk | 1 | ||||
| -rw-r--r-- | mk/vars.mk | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/mk/build.mk b/mk/build.mk index abf2d4a7c..986d66cd7 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -26,7 +26,6 @@ DEFCONFIG= ADK_DEBUG=n \ ADK_PACKAGE_PACEMAKER=n \ ADK_PACKAGE_PACEMAKER_MGMTD=n \ ADK_PACKAGE_PACEMAKER_PYTHON_GUI=n \ - ADK_PACKAGE_OPENJDK=n \ ADK_PACKAGE_OPENJDK7=n \ ADK_PACKAGE_CLASSPATH=n \ ADK_PACKAGE_GRUB=n \ diff --git a/mk/vars.mk b/mk/vars.mk index 0525f5129..657d44ae5 100644 --- a/mk/vars.mk +++ b/mk/vars.mk @@ -136,7 +136,6 @@ FLAGS_FOR_BUILD= ${CPPFLAGS_FOR_BUILD} ${CFLAGS_FOR_BUILD} ${LDFLAGS_FOR_BUILD} PATCH= ${BASH} $(SCRIPT_DIR)/patch.sh SED:= sed -i -e LINUX_DIR:= $(BUILD_DIR)/linux -LINUX_HEADER_DIR:= $(STAGING_DIR)/linux-header KERNEL_MODULE_FLAGS:= ARCH=${ARCH} KERNELVERSION="2.6" \ KERNEL_PATH=${LINUX_DIR} KERNELDIR=${LINUX_DIR} KERNEL_DIR=${LINUX_DIR} \ PREFIX=/usr CROSS_COMPILE="${TARGET_CROSS}" \ |