diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2011-08-22 08:00:13 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-08-22 08:00:13 +0200 |
| commit | 28f056393328e784ba24391912667cc6bff2ae52 (patch) | |
| tree | 505b64c0244902733c464d063aee9b9a4ec17f20 | |
| parent | 2a8f18f0aa29136e8d5dce664de031336e531360 (diff) | |
| parent | acd40b5ad4895af85b95cf9512ab20a3191c6b19 (diff) | |
Merge branch 'master' of ssh://openadk.org/git/openadk
| -rw-r--r-- | mk/buildhlp.mk | 18 | ||||
| -rw-r--r-- | mk/fetch.mk | 7 | ||||
| -rw-r--r-- | target/config/Config.in | 1 | ||||
| -rw-r--r-- | target/mips/Makefile | 3 | ||||
| -rw-r--r-- | target/ppc/Makefile | 8 |
5 files changed, 25 insertions, 12 deletions
diff --git a/mk/buildhlp.mk b/mk/buildhlp.mk index 3c79fc1e8..19b761f46 100644 --- a/mk/buildhlp.mk +++ b/mk/buildhlp.mk @@ -49,15 +49,27 @@ ifeq (${_CHECKSUM_COOKIE},) endif ifeq ($(EXTRACT_OVERRIDE),1) ${MAKE} do-extract -else +else ${EXTRACT_CMD} endif @${MAKE} post-extract $(MAKE_TRACE) touch $@ __use_generic_patch_target:=42 -else ifeq ($(strip ${_IN_PACKAGE}),1) -$(warning This package does not use the generic extraction and patch target; it's most likely to fail.) +else +include ${TOPDIR}/mk/fetch.mk +${WRKDIST}/.extract_done: ${_CHECKSUM_COOKIE} + $(MAKE) fetch +ifeq (${_CHECKSUM_COOKIE},) + rm -rf ${WRKDIST} ${WRKSRC} ${WRKBUILD} +endif +ifeq ($(EXTRACT_OVERRIDE),1) + ${MAKE} do-extract +else + ${EXTRACT_CMD} +endif + @${MAKE} post-extract $(MAKE_TRACE) + touch $@ endif ifeq ($(strip ${__use_generic_patch_target}),42) diff --git a/mk/fetch.mk b/mk/fetch.mk index 5c3edf918..a2590d467 100644 --- a/mk/fetch.mk +++ b/mk/fetch.mk @@ -59,14 +59,7 @@ endif define FETCH_template $(1): @fullname='$(1)'; \ - subname=$$$${fullname##$${DISTDIR}/}; \ filename=$$$${fullname##*/}; \ - i='$${LOCAL_DISTDIR}'; \ - if [[ -n $$$$i && -e $$$$i/$$$$subname ]]; then \ - cd "$$$$i"; \ - echo pax -rw "$$$$subname" '$${DISTDIR}/'; \ - exec pax -rw "$$$$subname" '$${DISTDIR}/'; \ - fi; \ mkdir -p "$$$${fullname%%/$$$$filename}"; \ cd "$$$${fullname%%/$$$$filename}"; \ for site in $${PKG_SITES} $${MASTER_SITE_BACKUP}; do \ diff --git a/target/config/Config.in b/target/config/Config.in index 5e89eb8f6..38dca4b19 100644 --- a/target/config/Config.in +++ b/target/config/Config.in @@ -334,7 +334,6 @@ config ADK_TARGET_LIB_UCLIBC boolean select ADK_uclibc depends on \ - !ADK_TARGET_SYSTEM_LEMOTE_YEELONG && \ !ADK_LINUX_SPARC64 && \ !ADK_LINUX_PPC64 && \ !ADK_LINUX_NATIVE diff --git a/target/mips/Makefile b/target/mips/Makefile index 7fc44a976..5d606046f 100644 --- a/target/mips/Makefile +++ b/target/mips/Makefile @@ -135,7 +135,8 @@ imageinstall: $(BIN_DIR)/$(ROOTFSTARBALL) ifeq ($(ADK_TARGET_SYSTEM_LEMOTE_YEELONG),y) @echo "Startup the netbook and type del to enter PMON:" @echo "PMON> load /dev/fs/ext2@usb0/boot/kernel" - @echo "PMON> g console=tty no_auto_cmd" + @echo "PMON> g root=/dev/sdc1" + @echo "The root parameter have to be changed." endif endif ifeq ($(ADK_TARGET_FS),cf) diff --git a/target/ppc/Makefile b/target/ppc/Makefile index a60d376a9..c643d6c5c 100644 --- a/target/ppc/Makefile +++ b/target/ppc/Makefile @@ -20,9 +20,17 @@ imageinstall: $(BIN_DIR)/$(INITRAMFS) @cp $(KERNEL) $(BIN_DIR)/$(TARGET_KERNEL) @echo 'The kernel file is: $(BIN_DIR)/${TARGET_KERNEL}' @echo 'The initramfs image is: ${BIN_DIR}/${INITRAMFS}' +ifeq ($(ADK_TARGET_SYSTEM_QEMU_PPC),y) + @echo "Start qemu with following command line:" + @echo 'qemu-system-ppc -M mac99 -nographic -kernel $(BIN_DIR)/$(TARGET_KERNEL) -initrd ${BIN_DIR}/${INITRAMFS}' +endif endif ifeq ($(ADK_TARGET_FS),initramfs-piggyback) imageinstall: ${BUILD_DIR}/${INITRAMFS_PIGGYBACK} createinitramfs @cp $(KERNEL) $(BIN_DIR)/${TARGET_KERNEL} @echo 'The kernel+initramfs file is: $(BIN_DIR)/${TARGET_KERNEL}' +ifeq ($(ADK_TARGET_SYSTEM_QEMU_PPC),y) + @echo "Start qemu with following command line:" + @echo 'qemu-system-ppc -M mac99 -nographic -kernel $(BIN_DIR)/$(TARGET_KERNEL)' +endif endif |