summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--package/eglibc/Makefile13
-rw-r--r--package/glibc/Makefile4
-rw-r--r--scripts/scan-pkgs.sh8
-rw-r--r--target/Config.in166
-rw-r--r--toolchain/gcc/Makefile.inc2
5 files changed, 108 insertions, 85 deletions
diff --git a/package/eglibc/Makefile b/package/eglibc/Makefile
index 5389c388f..02065328b 100644
--- a/package/eglibc/Makefile
+++ b/package/eglibc/Makefile
@@ -58,13 +58,14 @@ do-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y}
done
eglibc-dev-install:
+ ${INSTALL_DIR} $(IDIR_EGLIBC_DEV)/lib
# install linker script
- -cp ./files/libc.so.$(CPU_ARCH) $(IDIR_EGLIBC)/usr/lib/libc.so
- cd $(IDIR_EGLIBC)/lib && ln -sf libm.so.6 libm.so
- cd $(IDIR_EGLIBC)/lib && ln -sf libutil.so.1 libutil.so
- cd $(IDIR_EGLIBC)/lib && ln -sf librt.so.1 librt.so
- cd $(IDIR_EGLIBC)/lib && ln -sf libcrypt.so.1 libcrypt.so
- cd $(IDIR_EGLIBC)/lib && ln -sf libdl.so.2 libdl.so
+ -cp ./files/libc.so.$(CPU_ARCH) $(IDIR_EGLIBC_DEV)/usr/lib/libc.so
+ cd $(IDIR_EGLIBC_DEV)/lib && ln -sf libm.so.6 libm.so
+ cd $(IDIR_EGLIBC_DEV)/lib && ln -sf libutil.so.1 libutil.so
+ cd $(IDIR_EGLIBC_DEV)/lib && ln -sf librt.so.1 librt.so
+ cd $(IDIR_EGLIBC_DEV)/lib && ln -sf libcrypt.so.1 libcrypt.so
+ cd $(IDIR_EGLIBC_DEV)/lib && ln -sf libdl.so.2 libdl.so
# header package
$(MAKE) -C $(TOOLCHAIN_BUILD_DIR)/linux-$(KERNEL_VERSION) \
HOSTCC=$(HOSTCC) ARCH=$(ARCH) V=1 \
diff --git a/package/glibc/Makefile b/package/glibc/Makefile
index 45145d230..103452469 100644
--- a/package/glibc/Makefile
+++ b/package/glibc/Makefile
@@ -45,10 +45,10 @@ do-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y}
$(CP) $(STAGING_DIR)/lib/$$file.so* $(IDIR_GLIBC)/lib/; \
$(CP) $(STAGING_DIR)/lib/$$file-$(PKG_VERSION).so $(IDIR_GLIBC)/lib/; \
done
- # create ld.so link for mips gcc linker option
- cd $(IDIR_GLIBC)/lib && ln -sf ld-linux.so.2 ld.so.1
glibc-dev-install:
+ ${INSTALL_DIR} $(IDIR_GLIBC_DEV)/lib
+ cd $(IDIR_GLIBC_DEV)/lib && ln -sf ld-linux.so.2 ld.so.1
# header package
$(MAKE) -C $(TOOLCHAIN_BUILD_DIR)/linux-$(KERNEL_VERSION) \
HOSTCC=$(HOSTCC) ARCH=$(ARCH) V=1 \
diff --git a/scripts/scan-pkgs.sh b/scripts/scan-pkgs.sh
index 3e8478244..b96a92e8f 100644
--- a/scripts/scan-pkgs.sh
+++ b/scripts/scan-pkgs.sh
@@ -94,6 +94,14 @@ if [[ -n $ADK_PACKAGE_FONT_BITSTREAM_75DPI ]]; then
NEED_MKFONTDIR="$NEED_MKFONTDIR font-bitstream-75dpi"
fi
+if [[ -n $ADK_PACKAGE_FONT_ADOBE_100DPI ]]; then
+ NEED_MKFONTDIR="$NEED_MKFONTDIR font-adobe-100dpi"
+fi
+
+if [[ -n $ADK_PACKAGE_FONT_ADOBE_75DPI ]]; then
+ NEED_MKFONTDIR="$NEED_MKFONTDIR font-adobe-75dpi"
+fi
+
if [[ -n $NEED_GETTEXT ]]; then
if ! which xgettext >/dev/null 2>&1; then
echo >&2 You need gettext to build $NEED_GETTEXT
diff --git a/target/Config.in b/target/Config.in
index 655e606ae..7d7310421 100644
--- a/target/Config.in
+++ b/target/Config.in
@@ -189,84 +189,12 @@ config ADK_LINUX_NATIVE
Make a native build. Use host tools.
No toolchain will be created.
-config ADK_LINUX_X86_ALIX1C
- bool "PC Engines Alix1C"
- select ADK_alix1c
- select ADK_KERNEL_SCSI
- select ADK_KERNEL_ATA
- select ADK_KERNEL_BLK_DEV_SD
- select ADK_KERNEL_EXT2_FS
- select ADK_KERNEL_NET_PCI
- select ADK_KERNEL_NETDEVICES
- select ADK_KERNEL_NET_ETHERNET
- select ADK_KERNEL_MII
- select BUSYBOX_HWCLOCK
- select ADK_TARGET_WITH_USB
- select ADK_TARGET_WITH_VGA
- select ADK_TARGET_WITH_MINIPCI
- select ADK_TARGET_WITH_INPUT
- help
- Support for ALIX1C boards.
- http://www.pcengines.ch/
- Status: stable
-
-config ADK_LINUX_X86_ALIX2D
- bool "PC Engines Alix2D"
- select ADK_alix2d
- select ADK_KERNEL_SCSI
- select ADK_KERNEL_ATA
- select ADK_KERNEL_BLK_DEV_SD
- select ADK_KERNEL_EXT2_FS
- select ADK_KERNEL_NET_PCI
- select ADK_KERNEL_NETDEVICES
- select ADK_KERNEL_NET_ETHERNET
- select ADK_KERNEL_MII
- select BUSYBOX_HWCLOCK
- select ADK_TARGET_WITH_USB
- select ADK_TARGET_WITH_MINIPCI
- select ADK_TARGET_WITH_LEDS
- help
- Support for ALIX2D boards.
- http://www.pcengines.ch/
- Status: stable
-
-config ADK_LINUX_X86_ALIX2D13
- bool "PC Engines Alix2D13"
- select ADK_alix2d13
- select ADK_KERNEL_SCSI
- select ADK_KERNEL_ATA
- select ADK_KERNEL_BLK_DEV_SD
- select ADK_KERNEL_EXT2_FS
- select ADK_KERNEL_NET_PCI
- select ADK_KERNEL_NETDEVICES
- select ADK_KERNEL_NEW_LEDS
- select ADK_KERNEL_NET_ETHERNET
- select ADK_KERNEL_MII
- select BUSYBOX_HWCLOCK
- select ADK_TARGET_WITH_USB
- select ADK_TARGET_WITH_MINIPCI
- select ADK_TARGET_WITH_LEDS
+config ADK_LINUX_ALIX
+ bool "ALIX and WRAP boards"
help
- Support for ALIX2D13 boards.
- http://www.pcengines.ch/
- Status: stable
+ Support for Alix and Wrap boards.
+ http://www.pcengines.ch
-config ADK_LINUX_X86_WRAP
- bool "PC Engines WRAP"
- select ADK_wrap
- select ADK_KERNEL_SCSI
- select ADK_KERNEL_ATA
- select ADK_KERNEL_BLK_DEV_SD
- select ADK_KERNEL_EXT2_FS
- select ADK_KERNEL_NET_PCI
- select ADK_KERNEL_NETDEVICES
- select ADK_KERNEL_NET_ETHERNET
- select ADK_KERNEL_MII
- select BUSYBOX_HWCLOCK
- help
- End of life, but I still have one board.
- http://www.pcengines.ch/
- Status: stable
config ADK_LINUX_CRIS_FOXBOARD
bool "Foxboard (ETRAX LX100)"
@@ -520,6 +448,92 @@ config ADK_LINUX_X86_64_QEMU
endchoice
choice
+prompt "Alix/Wrap model"
+default ADK_LINUX_X86_ALIX1C
+depends on ADK_LINUX_ALIX
+
+config ADK_LINUX_X86_ALIX1C
+ bool "PC Engines Alix1C"
+ select ADK_alix1c
+ select ADK_KERNEL_SCSI
+ select ADK_KERNEL_ATA
+ select ADK_KERNEL_BLK_DEV_SD
+ select ADK_KERNEL_EXT2_FS
+ select ADK_KERNEL_NET_PCI
+ select ADK_KERNEL_NETDEVICES
+ select ADK_KERNEL_NET_ETHERNET
+ select ADK_KERNEL_MII
+ select BUSYBOX_HWCLOCK
+ select ADK_TARGET_WITH_USB
+ select ADK_TARGET_WITH_VGA
+ select ADK_TARGET_WITH_MINIPCI
+ select ADK_TARGET_WITH_INPUT
+ help
+ Support for ALIX1C boards.
+ http://www.pcengines.ch/
+ Status: stable
+
+config ADK_LINUX_X86_ALIX2D
+ bool "PC Engines Alix2D"
+ select ADK_alix2d
+ select ADK_KERNEL_SCSI
+ select ADK_KERNEL_ATA
+ select ADK_KERNEL_BLK_DEV_SD
+ select ADK_KERNEL_EXT2_FS
+ select ADK_KERNEL_NET_PCI
+ select ADK_KERNEL_NETDEVICES
+ select ADK_KERNEL_NET_ETHERNET
+ select ADK_KERNEL_MII
+ select BUSYBOX_HWCLOCK
+ select ADK_TARGET_WITH_USB
+ select ADK_TARGET_WITH_MINIPCI
+ select ADK_TARGET_WITH_LEDS
+ help
+ Support for ALIX2D boards.
+ http://www.pcengines.ch/
+ Status: stable
+
+config ADK_LINUX_X86_ALIX2D13
+ bool "PC Engines Alix2D13"
+ select ADK_alix2d13
+ select ADK_KERNEL_SCSI
+ select ADK_KERNEL_ATA
+ select ADK_KERNEL_BLK_DEV_SD
+ select ADK_KERNEL_EXT2_FS
+ select ADK_KERNEL_NET_PCI
+ select ADK_KERNEL_NETDEVICES
+ select ADK_KERNEL_NEW_LEDS
+ select ADK_KERNEL_NET_ETHERNET
+ select ADK_KERNEL_MII
+ select BUSYBOX_HWCLOCK
+ select ADK_TARGET_WITH_USB
+ select ADK_TARGET_WITH_MINIPCI
+ select ADK_TARGET_WITH_LEDS
+ help
+ Support for ALIX2D13 boards.
+ http://www.pcengines.ch/
+ Status: stable
+
+config ADK_LINUX_X86_WRAP
+ bool "PC Engines WRAP"
+ select ADK_wrap
+ select ADK_KERNEL_SCSI
+ select ADK_KERNEL_ATA
+ select ADK_KERNEL_BLK_DEV_SD
+ select ADK_KERNEL_EXT2_FS
+ select ADK_KERNEL_NET_PCI
+ select ADK_KERNEL_NETDEVICES
+ select ADK_KERNEL_NET_ETHERNET
+ select ADK_KERNEL_MII
+ select BUSYBOX_HWCLOCK
+ help
+ End of life, but I still have one board.
+ http://www.pcengines.ch/
+ Status: stable
+
+endchoice
+
+choice
prompt "Routerboard model"
default ADK_LINUX_MIPS_RB433
depends on ADK_LINUX_MIKROTIK
diff --git a/toolchain/gcc/Makefile.inc b/toolchain/gcc/Makefile.inc
index 9c21d37de..e40fc2dec 100644
--- a/toolchain/gcc/Makefile.inc
+++ b/toolchain/gcc/Makefile.inc
@@ -4,6 +4,6 @@
PKG_NAME:= gcc
PKG_VERSION:= 4.4.3
PKG_RELEASE:= 1
-PKG_MD5SUM:= 70f5ac588a79e3c9901d5b34f58d896d
+PKG_MD5SUM:= fe1ca818fc6d2caeffc9051fe67ff103
PKG_SITES:= ${MASTER_SITE_GNU:=gcc/gcc-${PKG_VERSION}/}
DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tar.bz2