summaryrefslogtreecommitdiff
path: root/mk
diff options
context:
space:
mode:
Diffstat (limited to 'mk')
-rw-r--r--mk/build.mk5
-rw-r--r--mk/image.mk10
2 files changed, 13 insertions, 2 deletions
diff --git a/mk/build.mk b/mk/build.mk
index e69821db0..d6e21fa85 100644
--- a/mk/build.mk
+++ b/mk/build.mk
@@ -32,6 +32,7 @@ DEFCONFIG= ADK_DEBUG=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_GPSD=n \
ADK_PACKAGE_GPSD_CLIENTS=n \
@@ -590,7 +591,7 @@ bulk:
done
bulkall:
- for libc in uclibc eglibc glibc;do \
+ for libc in uclibc eglibc glibc musl;do \
while read arch; do \
systems=$$(./scripts/getsystems $$arch| grep -v toolchain|grep -v qemu); \
for system in $$systems;do \
@@ -608,7 +609,7 @@ bulkall:
done
bulkallmod:
- for libc in uclibc eglibc glibc;do \
+ for libc in uclibc eglibc glibc musl;do \
while read arch; do \
systems=$$(./scripts/getsystems $$arch| grep -v toolchain|grep -v qemu); \
for system in $$systems;do \
diff --git a/mk/image.mk b/mk/image.mk
index f8e995ce2..57664464e 100644
--- a/mk/image.mk
+++ b/mk/image.mk
@@ -60,6 +60,16 @@ ifeq ($(ADK_LINUX_X86_64),y)
rm -rf ${TARGET_DIR}/usr/lib/
(cd ${TARGET_DIR}/usr ; ln -sf ${ADK_TARGET_LIBC_PATH} lib)
endif
+ifeq ($(ADK_LINUX_SPARC64),y)
+ # fixup lib dirs
+ mv ${TARGET_DIR}/lib/* ${TARGET_DIR}/${ADK_TARGET_LIBC_PATH}
+ rm -rf ${TARGET_DIR}/lib/
+ ln -sf /${ADK_TARGET_LIBC_PATH} ${TARGET_DIR}/lib
+ -mkdir ${TARGET_DIR}/usr/${ADK_TARGET_LIBC_PATH} 2>/dev/null
+ mv ${TARGET_DIR}/usr/lib/* ${TARGET_DIR}/usr/${ADK_TARGET_LIBC_PATH}
+ rm -rf ${TARGET_DIR}/usr/lib/
+ (cd ${TARGET_DIR}/usr ; ln -sf ${ADK_TARGET_LIBC_PATH} lib)
+endif
ifeq ($(ADK_TARGET_ABI_N32),y)
# fixup lib dirs
mv ${TARGET_DIR}/lib/* ${TARGET_DIR}/${ADK_TARGET_LIBC_PATH}