diff options
Diffstat (limited to 'package')
| -rw-r--r-- | package/base-files/Makefile | 3 | ||||
| -rw-r--r-- | package/libgcc/Makefile | 6 |
2 files changed, 8 insertions, 1 deletions
diff --git a/package/base-files/Makefile b/package/base-files/Makefile index 605922737..8ff743270 100644 --- a/package/base-files/Makefile +++ b/package/base-files/Makefile @@ -65,6 +65,9 @@ endif ifeq ($(ADK_TARGET_QEMU_ARM_MODEL_VERSATILE),y) $(SED) 's#ttyS#ttyAMA#g' $(IDIR_BASE_FILES)/etc/inittab endif +ifeq ($(ADK_TARGET_SYSTEM_ARANYM),y) + $(SED) 's#ttyS#nfcon0#g' $(IDIR_BASE_FILES)/etc/inittab +endif $(SED) 's#@SPEED@#$(ADK_RUNTIME_CONSOLE_SERIAL_SPEED)#' $(IDIR_BASE_FILES)/etc/inittab test -z $(ADK_RUNTIME_HOSTNAME) || \ echo $(ADK_RUNTIME_HOSTNAME) > $(IDIR_BASE_FILES)/etc/hostname; \ diff --git a/package/libgcc/Makefile b/package/libgcc/Makefile index 003cd9783..9c024504c 100644 --- a/package/libgcc/Makefile +++ b/package/libgcc/Makefile @@ -11,7 +11,7 @@ PKG_SECTION:= libs NO_DISTFILES:= 1 -PKG_ARCH_DEPENDS:= !sh !avr32 +PKG_ARCH_DEPENDS:= !avr32 include ${TOPDIR}/mk/package.mk @@ -24,8 +24,12 @@ INSTALL_STYLE:= manual do-install: ifeq ($(ADK_NATIVE),) ${INSTALL_DIR} ${IDIR_LIBGCC}/$(ADK_TARGET_LIBC_PATH) +ifeq ($(ADK_LINUX_SH),y) + ${CP} ${STAGING_TARGET_DIR}/lib/!m1/libgcc*.so* ${IDIR_LIBGCC}/$(ADK_TARGET_LIBC_PATH) +else ${CP} ${STAGING_TARGET_DIR}/$(ADK_TARGET_LIBC_PATH)/libgcc*.so* ${IDIR_LIBGCC}/$(ADK_TARGET_LIBC_PATH) endif +endif ifeq ($(ADK_TARGET_MULTILIB_X86_32),y) ${INSTALL_DIR} ${IDIR_LIBGCC}/lib32 ${CP} ${STAGING_TARGET_DIR_32}/lib/libgcc*.so* ${IDIR_LIBGCC}/lib32 |