diff options
38 files changed, 1587 insertions, 91 deletions
diff --git a/mk/build.mk b/mk/build.mk index 994611a15..f38616f52 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -120,7 +120,7 @@ switch: cp -p .config.old.${TARGET} .config.old; \ mv .cfg.${TARGET} .cfg; \ echo "Setting configuration to target: ${TARGET}"; \ - else echo "No old target config found";mv .config .config.bak;fi + else echo "No old target config found";mv .config .config.bak; make TARGET=${TARGET};fi ############################################################# # @@ -140,10 +140,8 @@ root_clean: clean: @$(TRACE) clean $(MAKE) -C $(CONFIG) clean - for d in ${STAGING_PARENT_PFX}; do \ - echo "clean: entering $$d" ; \ + for d in ${STAGING_PARENT}; do \ for f in $$(ls $$d/pkg/[a-z]* 2>/dev/null); do \ - echo "clean: cleaning for $$f" ; \ while read file ; do \ rm $$d/target/$$file 2>/dev/null; \ done < $$f ; \ diff --git a/package/Depends.mk b/package/Depends.mk index 7f455a4fe..732296f0a 100644 --- a/package/Depends.mk +++ b/package/Depends.mk @@ -181,7 +181,7 @@ openswan-compile: gmp-compile oprofile-compile: popt-compile osiris-compile: openssl-compile palantir-compile: jpeg-compile -parted-compile: e2fsprogs-compile +parted-compile: e2fsprogs-compile lvm-compile readline-compile pciutils-compile: zlib-compile popt-compile: libiconv-compile ifneq ($(strip ${ADK_PACKAGE_PORTMAP_LIBWRAP}),) diff --git a/package/cfinstall/Config.in b/package/cfinstall/Config.in index e553d2f77..2777b80e6 100644 --- a/package/cfinstall/Config.in +++ b/package/cfinstall/Config.in @@ -4,7 +4,10 @@ config ADK_PACKAGE_CFINSTALL select ADK_PACKAGE_SFDISK select ADK_PACKAGE_PARTED select ADK_PACKAGE_GRUB_BIN - depends on ADK_LINUX_X86_ALIX1C || ADK_LINUX_MIPS_RB532 + depends on \ + ADK_LINUX_X86_ALIX1C || \ + ADK_LINUX_X86_WRAP || \ + ADK_LINUX_MIPS_RB532 default n help Installs a rootfs tar archive onto a Compact Flash disk. diff --git a/package/cfinstall/Makefile b/package/cfinstall/Makefile index 7f10dba27..b48120005 100644 --- a/package/cfinstall/Makefile +++ b/package/cfinstall/Makefile @@ -24,6 +24,6 @@ pre-configure: do-install: ${INSTALL_DIR} $(IDIR_CFINSTALL)/sbin - ${INSTALL_BIN} ./src/cfinstall.sh $(IDIR_CFINSTALL)/sbin + ${INSTALL_BIN} ./src/cfinstall $(IDIR_CFINSTALL)/sbin include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/cfinstall/src/cfinstall.sh b/package/cfinstall/src/cfinstall index 1ff908963..1ff908963 100644 --- a/package/cfinstall/src/cfinstall.sh +++ b/package/cfinstall/src/cfinstall diff --git a/package/lvm/Makefile b/package/lvm/Makefile index 90c7f6405..6c73678a0 100644 --- a/package/lvm/Makefile +++ b/package/lvm/Makefile @@ -13,13 +13,14 @@ PKG_DEPENDS:= device-mapper libncurses PKG_URL:= http://sourceware.org/lvm2/ PKG_SITES:= ftp://sources.redhat.com/pub/lvm2/ +PKG_DESCR_DM:= device-mapper library and utility DISTFILES:= LVM2.${PKG_VERSION}.tgz WRKDIST= ${WRKDIR}/LVM2.${PKG_VERSION} include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,LVM,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -$(eval $(call PKG_template,DEVICE_MAPPER,device-mapper,${PKG_VERSION}-${PKG_RELEASE},,${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,DEVICE_MAPPER,device-mapper,${PKG_VERSION}-${PKG_RELEASE},,${PKG_DESCR_DM},${PKG_SECTION})) CONFIGURE_STYLE:= gnu CONFIGURE_ARGS+= --with-user="" --with-group="" \ diff --git a/package/parted/Config.in b/package/parted/Config.in index 05b8974be..04ace5a2b 100644 --- a/package/parted/Config.in +++ b/package/parted/Config.in @@ -3,5 +3,7 @@ config ADK_PACKAGE_PARTED tristate default n select ADK_PACKAGE_LIBUUID + select ADK_PACKAGE_DEVICE_MAPPER + select ADK_PACKAGE_LIBREADLINE help GNU parted. diff --git a/package/parted/Makefile b/package/parted/Makefile index 153f88c71..63a83105d 100644 --- a/package/parted/Makefile +++ b/package/parted/Makefile @@ -8,7 +8,7 @@ PKG_VERSION:= 1.9.0 PKG_RELEASE:= 1 PKG_MD5SUM:= 055305bc7bcf472ce38f9abf69a9d94d PKG_DESCR:= GNU parted -PKG_DEPENDS:= libuuid +PKG_DEPENDS:= libuuid libreadline device-mapper PKG_SECTION:= admin PKG_URL:= http://www.gnu.org/software/parted/index.shtml PKG_SITES:= ${MASTER_SITE_GNU:=parted/} diff --git a/target/Config.in b/target/Config.in index 18c57c7b6..94d98cd25 100644 --- a/target/Config.in +++ b/target/Config.in @@ -23,6 +23,9 @@ config ADK_NATIVE config ADK_alix1c tristate +config ADK_wrap + tristate + config ADK_arm_qemu tristate @@ -92,6 +95,7 @@ config ADK_g1 config ADK_TARGET string default "alix1c" if ADK_alix1c + default "wrap" if ADK_wrap default "qemu-arm" if ADK_arm_qemu default "qemu-cris" if ADK_cris_qemu default "qemu-mips" if ADK_mips_qemu @@ -141,6 +145,22 @@ config ADK_LINUX_X86_ALIX1C select ADK_KERNEL_MII select BUSYBOX_HWCLOCK help + Support for ALIX 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_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/ config ADK_LINUX_CRIS_FOXBOARD @@ -149,7 +169,8 @@ config ADK_LINUX_CRIS_FOXBOARD select ADK_PACKAGE_KMOD_USB_CONTROLLER select ADK_KERNEL_NLS help - Foxboard support + Support for Foxboard targets. + http://foxlx.acmesystems.it/ config ADK_LINUX_MIPS64_LEMOTE bool "Lemote Subnotebook Yeeloong" @@ -163,12 +184,16 @@ config ADK_LINUX_MIPS64_LEMOTE select ADK_KERNEL_MII select ADK_KERNEL_SWAP help - Lemote Subnotebook + Lemote Subnotebook. + http://www.lemote.com/english/index.html + http://www.tekmote.nl/ config ADK_LINUX_MIKROTIK bool "Mikrotik Routerboards" help - Support for Mikrotik Routerboards + Support for Mikrotik Routerboards + http://www.mikrotik.com + http://www.routerboards.com config ADK_LINUX_MIPS_WAG54G bool "Linksys WAG54G" @@ -178,8 +203,8 @@ config ADK_LINUX_MIPS_WAG54G select ADK_KERNEL_MII select ADK_wag54g help - Linksys WAG54G DSL router with Wireless - TI AR7 platform + Linksys WAG54G DSL router with Wireless. + (Texas Instruments AR7 platform) config ADK_LINUX_ARM_TOMTOM bool "TomTom Applications" @@ -201,7 +226,7 @@ config ADK_LINUX_ARM_G1 help Support for Google G1. Just toolchain support to cross-compile your own - applications. + applications. Use static linking for your packages. #config ADK_LINUX_XSCALE_ZAURUS # bool "Zaurus SL-C3200" @@ -315,7 +340,7 @@ config ADK_LINUX_MIPS64EL_QEMU config ADK_LINUX_CRIS_QEMU bool "cris" select ADK_cris_qemu -# select ADK_BROKEN + depends on ADK_BROKEN help Qemu support for CRISv32 architecture. @@ -413,6 +438,7 @@ config ADK_TARGET_LIB_EGLIBC ADK_LINUX_MIPSEL_QEMU || \ ADK_LINUX_MIPS64EL_QEMU || \ ADK_LINUX_X86_ALIX1C || \ + ADK_LINUX_X86_WRAP || \ ADK_LINUX_MIPS_RB411 || \ ADK_LINUX_MIPS_RB433 || \ ADK_LINUX_MIPS_RB532 || \ @@ -433,6 +459,7 @@ config ADK_TARGET_LIB_GLIBC ADK_LINUX_MIPSEL_QEMU || \ ADK_LINUX_MIPS64EL_QEMU || \ ADK_LINUX_X86_ALIX1C || \ + ADK_LINUX_X86_WRAP || \ ADK_LINUX_MIPS_RB411 || \ ADK_LINUX_MIPS_RB433 || \ ADK_LINUX_RESCUE || \ @@ -460,7 +487,8 @@ prompt "Target Firmware type" config ADK_TARGET_ROOTFS_INITRAMFS bool "initramfs filesystem" - depends on ADK_LINUX_QEMU || \ + depends on \ + ADK_LINUX_QEMU || \ ADK_LINUX_NATIVE || \ ADK_LINUX_RESCUE select ADK_KERNEL_BLK_DEV_INITRD @@ -470,7 +498,8 @@ config ADK_TARGET_ROOTFS_INITRAMFS config ADK_TARGET_ROOTFS_INITRAMFS_PIGGYBACK bool "initramfs filesystem included into kernel image" select ADK_LINUX_INITRAMFS_BUILTIN - depends on ADK_LINUX_QEMU || \ + depends on \ + ADK_LINUX_QEMU || \ ADK_LINUX_X86_64_SHUTTLE || \ ADK_LINUX_NATIVE || \ ADK_LINUX_RESCUE @@ -479,14 +508,16 @@ config ADK_TARGET_ROOTFS_INITRAMFS_PIGGYBACK config ADK_TARGET_ROOTFS_SQUASHFS bool "squashfs read-only root filesystem" - depends on ADK_LINUX_CRIS_FOXBOARD || \ + depends on \ + ADK_LINUX_CRIS_FOXBOARD || \ ADK_LINUX_MIPS_WAG54G help highly compressed read-only filesystem for flash. config ADK_TARGET_ROOTFS_YAFFS bool "YAFFS2 rootfilesystem (NAND)" - depends on ADK_LINUX_MIPS_RB532 || \ + depends on \ + ADK_LINUX_MIPS_RB532 || \ ADK_LINUX_MIPS_RB433 || \ ADK_LINUX_MIPS_RB411 help @@ -494,8 +525,10 @@ config ADK_TARGET_ROOTFS_YAFFS config ADK_TARGET_ROOTFS_NFSROOT bool "NFS root" - depends on ADK_LINUX_CRIS_FOXBOARD || \ + depends on \ + ADK_LINUX_CRIS_FOXBOARD || \ ADK_LINUX_X86_ALIX1C || \ + ADK_LINUX_X86_WRAP || \ ADK_LINUX_MIPS_RB532 || \ ADK_LINUX_MIPS_RB433 || \ ADK_LINUX_MIPS_RB411 || \ @@ -512,17 +545,21 @@ config ADK_TARGET_ROOTFS_NFSROOT config ADK_TARGET_ROOTFS_EXT2_CF bool "read-write filesystem for compact flash (ext2)" - depends on ADK_LINUX_X86_ALIX1C || ADK_LINUX_MIPS_RB532 + depends on \ + ADK_LINUX_X86_ALIX1C || \ + ADK_LINUX_X86_WRAP || \ + ADK_LINUX_MIPS_RB532 select ADK_KERNEL_EXT2_FS select ADK_KERNEL_SCSI select ADK_KERNEL_BLK_DEV_SD help - Use this option if you have a compact flash + Use this option if you have a compact flash reader inside your hardware and want to boot from it. config ADK_TARGET_ROOTFS_ARCHIVE bool "Archive usable for different filesystems" - depends on ADK_LINUX_QEMU || \ + depends on \ + ADK_LINUX_QEMU || \ ADK_LINUX_XSCALE_ZAURUS || \ ADK_LINUX_MIPS64_LEMOTE || \ ADK_LINUX_X86_64_SHUTTLE @@ -709,6 +746,7 @@ config ADK_TARGET_PACKAGE_RPM endchoice +# broken and untested right now #config ADK_SSP # bool "Enable Stack Smashing Protection" # default n diff --git a/target/alix1c/Makefile b/target/alix1c/Makefile index 64f442027..93a7c6642 100644 --- a/target/alix1c/Makefile +++ b/target/alix1c/Makefile @@ -19,7 +19,10 @@ imageinstall: $(BIN_DIR)/$(ROOTFSTARBALL) endif ifeq ($(FS),nfsroot) imageinstall: $(BIN_DIR)/$(ROOTFSTARBALL) + @cp $(LINUX_DIR)/arch/x86/boot/bzImage \ + $(BIN_DIR)/${ADK_TARGET}-${ARCH}-kernel $(MAKE_TRACE) @echo - @echo 'The nfs root tarball is: ${BIN_DIR}/${ROOTFSTARBALL}' + @echo 'The linux kernel is here: $(BIN_DIR)/${ADK_TARGET}-${ARCH}-kernel' + @echo 'The nfs root tarball is here: ${BIN_DIR}/${ROOTFSTARBALL}' @echo 'Login as user root with password linux123 via ssh or console' endif diff --git a/target/foxboard/Makefile b/target/foxboard/Makefile index e8dbd9108..1ede6b378 100644 --- a/target/foxboard/Makefile +++ b/target/foxboard/Makefile @@ -18,7 +18,7 @@ tools-compile: $(TOOLS_BUILD_DIR) kernel-install: tools-compile PATH='${TARGET_PATH}' mkfimage $(LINUX_DIR)/arch/cris/boot/zImage \ - $(BIN_DIR)/${DEVICE}-${ARCH}-kernel $(MAKE_TRACE) + $(BIN_DIR)/${ADK_TARGET}-${ARCH}-kernel $(MAKE_TRACE) ifeq ($(FS),squashfs) imageinstall: $(BIN_DIR)/$(ROOTFSSQUASHFS) @@ -30,7 +30,7 @@ endif ifeq ($(FS),nfsroot) imageinstall: ${BIN_DIR}/${ROOTFSTARBALL} @echo - @echo Use sudo ./boot_linux -F -i ${DEVICE}-${ARCH}-kernel to flash the kernel + @echo Use sudo ./boot_linux -F -i ${ADK_TARGET}-${ARCH}-kernel to flash the kernel @echo Do not forget to set network boot jumper, before you start the foxboard @echo ${ROOTFSTARBALL} is your nfs root and can be extracted on your nfs server @echo 'Login as user root with password linux123 via ssh or console' diff --git a/target/g1/Makefile b/target/g1/Makefile index 6a7676f2c..6b6da3576 100644 --- a/target/g1/Makefile +++ b/target/g1/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/mk/kernel-build.mk include $(TOPDIR)/mk/image.mk kernel-install: - cp $(LINUX_DIR)/arch/arm/boot/zImage $(BIN_DIR)/${DEVICE}-${ARCH}-kernel + cp $(LINUX_DIR)/arch/arm/boot/zImage $(BIN_DIR)/${ADK_TARGET}-${ARCH}-kernel ifeq ($(FS),archive) imageinstall: $(BIN_DIR)/$(ROOTFSTARBALL) diff --git a/target/lemote/Makefile b/target/lemote/Makefile index 619a97967..fa2adc09e 100644 --- a/target/lemote/Makefile +++ b/target/lemote/Makefile @@ -11,7 +11,7 @@ OSTRIP:=-R .reginfo -R .notes -R .note -R .comment -R .mdebug -R .note.gnu.build kernel-install: $(TARGET_CROSS)objcopy $(OSTRIP) -S $(LINUX_DIR)/vmlinux \ - $(BIN_DIR)/${DEVICE}-${ARCH}-kernel + $(BIN_DIR)/${ADK_TARGET}-${ARCH}-kernel createinit: $(SED) 's#^CONFIG_INITRAMFS_SOURCE.*#CONFIG_INITRAMFS_SOURCE="./initramfs_list"#' $(LINUX_DIR)/.config @@ -20,11 +20,11 @@ createinit: $(MAKE) -C $(LINUX_DIR) V=0 CROSS_COMPILE="$(TARGET_CROSS)" ARCH=$(ARCH) \ CC="$(TARGET_CC)" $(MAKE_TRACE) $(CP) $(LINUX_DIR)/arch/mips/loongson/image/vmlinuz \ - $(BIN_DIR)/${DEVICE}-${ARCH}-kernel + $(BIN_DIR)/${ADK_TARGET}-${ARCH}-kernel ifeq ($(FS),nfsroot) imageinstall: $(BIN_DIR)/$(ROOTFSTARBALL) - @echo 'The kernel file is: ${BIN_DIR}/${DEVICE}-${ARCH}-kernel' + @echo 'The kernel file is: ${BIN_DIR}/${ADK_TARGET}-${ARCH}-kernel' @echo 'The nfs root tarball is: ${BIN_DIR}/${ROOTFSTARBALL}' @echo 'Boot your lemote and type following commands in PMON:' @echo 'PMON> ifaddr rtl0 <ip-address-client>' @@ -34,7 +34,7 @@ imageinstall: $(BIN_DIR)/$(ROOTFSTARBALL) endif ifeq ($(FS),encrypted) imageinstall: $(BIN_DIR)/$(ROOTFSTARBALL) createinit - @echo 'The kernel+cryptinit file is: ${BIN_DIR}/${DEVICE}-${ARCH}-kernel' + @echo 'The kernel+cryptinit file is: ${BIN_DIR}/${ADK_TARGET}-${ARCH}-kernel' @echo "The RootFS tarball is: $(BIN_DIR)/$(ROOTFSTARBALL)," @echo 'Boot your lemote via NFS or USB.' @echo 'Then create at least three partitions with fdisk:' @@ -55,7 +55,7 @@ imageinstall: $(BIN_DIR)/$(ROOTFSTARBALL) createinit @echo @echo 'Copy $(ROOTFSTARBALL) via scp to /mnt/root and extract it' @echo 'cd /mnt/root ; gunzip $(ROOTFSTARBALL); tar xpvf $(ROOTFSTARBALL)' - @echo 'Copy ${DEVICE}-${ARCH}-kernel via scp to /mnt/boot/boot' + @echo 'Copy ${ADK_TARGET}-${ARCH}-kernel via scp to /mnt/boot/boot' @echo 'Move boot.cfg to /mnt/boot/boot' @echo 'mv /mnt/root/boot/boot.cfg /mnt/boot/boot' @echo 'cd /mnt/root ; mknod -m 644 console c 5 1' @@ -63,14 +63,14 @@ imageinstall: $(BIN_DIR)/$(ROOTFSTARBALL) createinit endif ifeq ($(FS),initramfs) imageinstall: $(BIN_DIR)/$(INITRAMFS) - @echo 'The kernel file is: ${BIN_DIR}/${DEVICE}-${ARCH}-kernel' + @echo 'The kernel file is: ${BIN_DIR}/${ADK_TARGET}-${ARCH}-kernel' @echo 'The initramfs image is: ${BIN_DIR}/${INITRAMFS}' @echo 'Login as user root with password linux123 via ssh or console' endif ifeq ($(FS),archive) imageinstall: $(BIN_DIR)/$(ROOTFSTARBALL) @echo - @echo 'The kernel file is: ${BIN_DIR}/${DEVICE}-${ARCH}-kernel' + @echo 'The kernel file is: ${BIN_DIR}/${ADK_TARGET}-${ARCH}-kernel' @echo "The RootFS tarball is: $(BIN_DIR)/$(ROOTFSTARBALL)," @echo 'Login as user root with password linux123 via ssh or console' endif diff --git a/target/native/Makefile b/target/native/Makefile index 3b4039167..471008094 100644 --- a/target/native/Makefile +++ b/target/native/Makefile @@ -12,8 +12,8 @@ kernel-install: ifeq ($(FS),initramfs) imageinstall: $(BIN_DIR)/$(INITRAMFS) - cp $(LINUX_DIR)/arch/x86/boot/bzImage $(BIN_DIR)/${DEVICE}-${ARCH}-kernel - @echo 'The kernel file is: ${BIN_DIR}/${DEVICE}-${ARCH}-kernel' + cp $(LINUX_DIR)/arch/x86/boot/bzImage $(BIN_DIR)/${ADK_TARGET}-${ARCH}-kernel + @echo 'The kernel file is: ${BIN_DIR}/${ADK_TARGET}-${ARCH}-kernel' @echo 'The initramfs image is: ${BIN_DIR}/${INITRAMFS}' @echo 'Login as user root with password linux123 via ssh or console' endif diff --git a/target/qemu-arm/Makefile b/target/qemu-arm/Makefile index efe77e76e..4f7c7904a 100644 --- a/target/qemu-arm/Makefile +++ b/target/qemu-arm/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/mk/kernel-build.mk include $(TOPDIR)/mk/image.mk kernel-install: - cp $(LINUX_DIR)/arch/arm/boot/zImage $(BIN_DIR)/${DEVICE}-${ARCH}-kernel + cp $(LINUX_DIR)/arch/arm/boot/zImage $(BIN_DIR)/${ADK_TARGET}-${ARCH}-kernel createinit: @-rm $(LINUX_DIR)/usr/initramfs_data.cpio.lzma @@ -20,7 +20,7 @@ createinit: $(MAKE) -C $(LINUX_DIR) V=1 CROSS_COMPILE="$(TARGET_CROSS)" ARCH=$(ARCH) \ CC="$(TARGET_CC)" $(MAKE_TRACE) $(CP) $(LINUX_DIR)/arch/arm/boot/zImage \ - $(BIN_DIR)/${DEVICE}-${ARCH}-kernel + $(BIN_DIR)/${ADK_TARGET}-${ARCH}-kernel ifeq ($(FS),archive) imageinstall: $(BIN_DIR)/$(ROOTFSTARBALL) @@ -30,14 +30,14 @@ imageinstall: $(BIN_DIR)/$(ROOTFSTARBALL) endif ifeq ($(FS),initramfs) imageinstall: $(BIN_DIR)/$(INITRAMFS) - @echo 'The kernel file is: ${BIN_DIR}/${DEVICE}-${ARCH}-kernel' + @echo 'The kernel file is: ${BIN_DIR}/${ADK_TARGET}-${ARCH}-kernel' @echo 'The initramfs image is: ${BIN_DIR}/${INITRAMFS}' - @echo 'qemu-system-arm -M spitz -portrait -kernel $(BIN_DIR)/${DEVICE}-${ARCH}-kernel -initrd ${BIN_DIR}/${INITRAMFS}' + @echo 'qemu-system-arm -M spitz -portrait -kernel $(BIN_DIR)/${ADK_TARGET}-${ARCH}-kernel -initrd ${BIN_DIR}/${INITRAMFS}' @echo 'Login as user root with password linux123 via ssh or console' endif ifeq ($(FS),initramfs-piggyback) imageinstall: ${BUILD_DIR}/${INITRAMFS_PIGGYBACK} createinit - @echo 'The kernel file is: ${BIN_DIR}/${DEVICE}-${ARCH}-kernel' + @echo 'The kernel file is: ${BIN_DIR}/${ADK_TARGET}-${ARCH}-kernel' @echo 'Login as user root with password linux123 via ssh or console' endif diff --git a/target/qemu-cris/Makefile b/target/qemu-cris/Makefile index 81cfffc73..f887510cd 100644 --- a/target/qemu-cris/Makefile +++ b/target/qemu-cris/Makefile @@ -16,7 +16,7 @@ tools-compile: $(TOOLS_BUILD_DIR) kernel-install: tools-compile PATH='${TARGET_PATH}' \ mkfimage $(LINUX_DIR)/arch/cris/arch-v32/boot/zImage \ - $(BIN_DIR)/${DEVICE}-${ARCH}-kernel $(MAKE_TRACE) + $(BIN_DIR)/${ADK_TARGET}-${ARCH}-kernel $(MAKE_TRACE) ifeq ($(FS),ext2) imageinstall: $(BIN_DIR)/$(ROOTFSTARBALL) @@ -29,7 +29,7 @@ endif ifeq ($(FS),initramfs) imageinstall: $(BIN_DIR)/$(INITRAMFS) - @echo 'The kernel file is: ${BIN_DIR}/${DEVICE}-${ARCH}-kernel' + @echo 'The kernel file is: ${BIN_DIR}/${ADK_TARGET}-${ARCH}-kernel' @echo 'The initramfs image is: ${BIN_DIR}/${INITRAMFS}' @echo 'Login as user root with password linux123 via ssh or console' endif diff --git a/target/qemu-mips/Makefile b/target/qemu-mips/Makefile index c2f19e5b2..58d8b7936 100644 --- a/target/qemu-mips/Makefile +++ b/target/qemu-mips/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/mk/kernel-build.mk include $(TOPDIR)/mk/image.mk kernel-install: - cp $(LINUX_DIR)/vmlinux $(BIN_DIR)/${DEVICE}-${ARCH}-kernel + cp $(LINUX_DIR)/vmlinux $(BIN_DIR)/${ADK_TARGET}-${ARCH}-kernel ifeq ($(FS),ext2) imageinstall: $(BIN_DIR)/$(ROOTFSTARBALL) @@ -17,14 +17,14 @@ imageinstall: $(BIN_DIR)/$(ROOTFSTARBALL) @echo "Use following command to create a QEMU Image:" @echo "sudo ./scripts/create-image.sh -n qemu-mips.img $(BIN_DIR)/$(ROOTFSTARBALL)" @echo "Start qemu with following options:" - @echo 'qemu-system-mips -nographic -M malta -kernel $(BIN_DIR)/${DEVICE}-${ARCH}-kernel -hda qemu-mips.img -append "root=/dev/hda1"' + @echo 'qemu-system-mips -nographic -M malta -kernel $(BIN_DIR)/${ADK_TARGET}-${ARCH}-kernel -hda qemu-mips.img -append "root=/dev/hda1"' @echo 'Login as user root with password linux123 via ssh or console' endif ifeq ($(FS),initramfs) imageinstall: $(BIN_DIR)/$(INITRAMFS) - @echo 'The kernel file is: ${BIN_DIR}/${DEVICE}-${ARCH}-kernel' + @echo 'The kernel file is: ${BIN_DIR}/${ADK_TARGET}-${ARCH}-kernel' @echo 'The initramfs image is: ${BIN_DIR}/${INITRAMFS}' - @echo 'qemu-system-mips -nographic -M malta -kernel $(BIN_DIR)/${DEVICE}-${ARCH}-kernel -initrd ${BIN_DIR}/${INITRAMFS} + @echo 'qemu-system-mips -nographic -M malta -kernel $(BIN_DIR)/${ADK_TARGET}-${ARCH}-kernel -initrd ${BIN_DIR}/${INITRAMFS} @echo 'Login as user root with password linux123 via ssh or console' endif diff --git a/target/qemu-mips64/Makefile b/target/qemu-mips64/Makefile index 58c1a8377..1e4bc3ee6 100644 --- a/target/qemu-mips64/Makefile +++ b/target/qemu-mips64/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/mk/kernel-build.mk include $(TOPDIR)/mk/image.mk kernel-install: - cp $(LINUX_DIR)/vmlinux $(BIN_DIR)/${DEVICE}-${ARCH}-kernel + cp $(LINUX_DIR)/vmlinux $(BIN_DIR)/${ADK_TARGET}-${ARCH}-kernel ifeq ($(FS),ext2) imageinstall: $(BIN_DIR)/$(ROOTFSTARBALL) @@ -17,14 +17,14 @@ imageinstall: $(BIN_DIR)/$(ROOTFSTARBALL) @echo "Use following command to create a QEMU Image:" @echo "sudo ./scripts/create-image.sh -n qemu-mips.img $(BIN_DIR)/$(ROOTFSTARBALL)" @echo "Start qemu with following options:" - @echo 'qemu-system-mips64 -nographic -M malta -kernel $(BIN_DIR)/${DEVICE}-${ARCH}-kernel -hda qemu-mips.img -append "root=/dev/hda1"' + @echo 'qemu-system-mips64 -nographic -M malta -kernel $(BIN_DIR)/${ADK_TARGET}-${ARCH}-kernel -hda qemu-mips.img -append "root=/dev/hda1"' @echo 'Login as user root with password linux123 via ssh or console' endif ifeq ($(FS),initramfs) imageinstall: $(BIN_DIR)/$(INITRAMFS) - @echo 'The kernel file is: ${BIN_DIR}/${DEVICE}-${ARCH}-kernel' + @echo 'The kernel file is: ${BIN_DIR}/${ADK_TARGET}-${ARCH}-kernel' @echo 'The initramfs image is: ${BIN_DIR}/${INITRAMFS}' - @echo 'qemu-system-mips64 -nographic -M malta -kernel $(BIN_DIR)/${DEVICE}-${ARCH}-kernel -initrd ${BIN_DIR}/${INITRAMFS}' + @echo 'qemu-system-mips64 -nographic -M malta -kernel $(BIN_DIR)/${ADK_TARGET}-${ARCH}-kernel -initrd ${BIN_DIR}/${INITRAMFS}' @echo 'Login as user root with password linux123 via ssh or console' endif diff --git a/target/qemu-mips64el/Makefile b/target/qemu-mips64el/Makefile index 3ece7de75..46ca45cc8 100644 --- a/target/qemu-mips64el/Makefile +++ b/target/qemu-mips64el/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/mk/kernel-build.mk include $(TOPDIR)/mk/image.mk kernel-install: - cp $(LINUX_DIR)/vmlinux $(BIN_DIR)/${DEVICE}-${ARCH}-kernel + cp $(LINUX_DIR)/vmlinux $(BIN_DIR)/${ADK_TARGET}-${ARCH}-kernel ifeq ($(FS),ext2) imageinstall: $(BIN_DIR)/$(ROOTFSTARBALL) @@ -17,14 +17,14 @@ imageinstall: $(BIN_DIR)/$(ROOTFSTARBALL) @echo "Use following command to create a QEMU Image:" @echo "sudo ./scripts/create-image.sh -n qemu-mips.img $(BIN_DIR)/$(ROOTFSTARBALL)" @echo "Start qemu with following options:" - @echo 'qemu-system-mips64el -nographic -M malta -kernel $(BIN_DIR)/${DEVICE}-${ARCH}-kernel -hda qemu-mips.img -append "root=/dev/hda1"' + @echo 'qemu-system-mips64el -nographic -M malta -kernel $(BIN_DIR)/${ADK_TARGET}-${ARCH}-kernel -hda qemu-mips.img -append "root=/dev/hda1"' @echo 'Login as user root with password linux123 via ssh or console' endif ifeq ($(FS),initramfs) imageinstall: $(BIN_DIR)/$(INITRAMFS) - @echo 'The kernel file is: ${BIN_DIR}/${DEVICE}-${ARCH}-kernel' + @echo 'The kernel file is: ${BIN_DIR}/${ADK_TARGET}-${ARCH}-kernel' @echo 'The initramfs image is: ${BIN_DIR}/${INITRAMFS}' - @echo 'qemu-system-mips64el -nographic -M malta -kernel $(BIN_DIR)/${DEVICE}-${ARCH}-kernel -initrd ${BIN_DIR}/${INITRAMFS}' + @echo 'qemu-system-mips64el -nographic -M malta -kernel $(BIN_DIR)/${ADK_TARGET}-${ARCH}-kernel -initrd ${BIN_DIR}/${INITRAMFS}' @echo 'Login as user root with password linux123 via ssh or console' endif diff --git a/target/qemu-mipsel/Makefile b/target/qemu-mipsel/Makefile index 41a2f6710..a74fc3ba8 100644 --- a/target/qemu-mipsel/Makefile +++ b/target/qemu-mipsel/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/mk/kernel-build.mk include $(TOPDIR)/mk/image.mk kernel-install: - cp $(LINUX_DIR)/vmlinux $(BIN_DIR)/${DEVICE}-${ARCH}-kernel + cp $(LINUX_DIR)/vmlinux $(BIN_DIR)/${ADK_TARGET}-${ARCH}-kernel ifeq ($(FS),ext2) imageinstall: $(BIN_DIR)/$(ROOTFSTARBALL) @@ -18,14 +18,14 @@ imageinstall: $(BIN_DIR)/$(ROOTFSTARBALL) @echo "sudo ./scripts/create-image.sh -n qemu-mips.img $(BIN_DIR)/$(ROOTFSTARBALL)" @echo "Be sure to change permissions after image creation." @echo "Start qemu with following options:" - @echo 'qemu-system-mipsel -nographic -M malta -kernel $(BIN_DIR)/${DEVICE}-${ARCH}-kernel -hda qemu-mips.img -append "root=/dev/hda1"' + @echo 'qemu-system-mipsel -nographic -M malta -kernel $(BIN_DIR)/${ADK_TARGET}-${ARCH}-kernel -hda qemu-mips.img -append "root=/dev/hda1"' @echo 'Login as user root with password linux123 via ssh or console' endif ifeq ($(FS),initramfs) imageinstall: $(BIN_DIR)/$(INITRAMFS) - @echo 'The kernel file is: ${BIN_DIR}/${DEVICE}-${ARCH}-kernel' + @echo 'The kernel file is: ${BIN_DIR}/${ADK_TARGET}-${ARCH}-kernel' @echo 'The initramfs image is: ${BIN_DIR}/${INITRAMFS}' - @echo 'qemu-system-mipsel -nographic -M malta -kernel $(BIN_DIR)/${DEVICE}-${ARCH}-kernel -initrd ${BIN_DIR}/${INITRAMFS}' + @echo 'qemu-system-mipsel -nographic -M malta -kernel $(BIN_DIR)/${ADK_TARGET}-${ARCH}-kernel -initrd ${BIN_DIR}/${INITRAMFS}' @echo 'Login as user root with password linux123 via ssh or console' endif diff --git a/target/qemu-x86/Makefile b/target/qemu-x86/Makefile index aabe53a36..99138be1a 100644 --- a/target/qemu-x86/Makefile +++ b/target/qemu-x86/Makefile @@ -21,9 +21,9 @@ endif ifeq ($(FS),initramfs) imageinstall: $(BIN_DIR)/$(INITRAMFS) - @cp $(LINUX_DIR)/arch/x86/boot/bzImage $(BIN_DIR)/${DEVICE}-${ARCH}-kernel - @echo 'The kernel file is: ${BIN_DIR}/${DEVICE}-${ARCH}-kernel' + @cp $(LINUX_DIR)/arch/x86/boot/bzImage $(BIN_DIR)/${ADK_TARGET}-${ARCH}-kernel + @echo 'The kernel file is: ${BIN_DIR}/${ADK_TARGET}-${ARCH}-kernel' @echo 'The initramfs image is: ${BIN_DIR}/${INITRAMFS}' - @echo 'qemu -nographic -kernel $(BIN_DIR)/${DEVICE}-${ARCH}-kernel -initrd ${BIN_DIR}/${INITRAMFS} -append "console=ttyS0"' + @echo 'qemu -nographic -kernel $(BIN_DIR)/${ADK_TARGET}-${ARCH}-kernel -initrd ${BIN_DIR}/${INITRAMFS} -append "console=ttyS0"' @echo 'Login as user root with password linux123 via ssh or console' endif diff --git a/target/qemu-x86_64/Makefile b/target/qemu-x86_64/Makefile index 7fe4f0154..e5ad35946 100644 --- a/target/qemu-x86_64/Makefile +++ b/target/qemu-x86_64/Makefile @@ -21,9 +21,9 @@ endif ifeq ($(FS),initramfs) imageinstall: $(BIN_DIR)/$(INITRAMFS) - @cp $(LINUX_DIR)/arch/x86/boot/bzImage $(BIN_DIR)/${DEVICE}-${ARCH}-kernel - @echo 'The kernel file is: ${BIN_DIR}/${DEVICE}-${ARCH}-kernel' + @cp $(LINUX_DIR)/arch/x86/boot/bzImage $(BIN_DIR)/${ADK_TARGET}-${ARCH}-kernel + @echo 'The kernel file is: ${BIN_DIR}/${ADK_TARGET}-${ARCH}-kernel' @echo 'The initramfs image is: ${BIN_DIR}/${INITRAMFS}' - @echo 'qemu-system-x86_64 -nographic -kernel $(BIN_DIR)/${DEVICE}-${ARCH}-kernel -initrd ${BIN_DIR}/${INITRAMFS} -append "console=ttyS0"' + @echo 'qemu-system-x86_64 -nographic -kernel $(BIN_DIR)/${ADK_TARGET}-${ARCH}-kernel -initrd ${BIN_DIR}/${INITRAMFS} -append "console=ttyS0"' @echo 'Login as user root with password linux123 via ssh or console' endif diff --git a/target/rb411/Makefile b/target/rb411/Makefile index f389cf2e5..4a17d048e 100644 --- a/target/rb411/Makefile +++ b/ |