From 599982c916530310b29f609f44d10cd5a6b381a4 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 13 Apr 2014 22:14:31 +0200 Subject: add pregenerated core.img, there is no portable way to do it right now --- target/x86/Makefile | 4 ++++ target/x86/sys-available/generic-pc | 1 + target/x86/sys-available/ibm-x40 | 2 +- target/x86_64/Makefile | 11 ++++++++++- 4 files changed, 16 insertions(+), 2 deletions(-) (limited to 'target') diff --git a/target/x86/Makefile b/target/x86/Makefile index 27920819f..736f1c359 100644 --- a/target/x86/Makefile +++ b/target/x86/Makefile @@ -9,7 +9,11 @@ include $(TOPDIR)/mk/image.mk KERNEL:=$(LINUX_DIR)/arch/x86/boot/bzImage ifeq ($(ADK_TARGET_QEMU_WITH_BOOTLOADER),y) +ifeq ($(ADK_TARGET_QEMU_WITHOUT_GRAPHIC),y) +CREATE:=./scripts/create.sh -g -t +else CREATE:=./scripts/create.sh -g +endif else CREATE:=./scripts/create.sh endif diff --git a/target/x86/sys-available/generic-pc b/target/x86/sys-available/generic-pc index 76d228936..72ae99765 100644 --- a/target/x86/sys-available/generic-pc +++ b/target/x86/sys-available/generic-pc @@ -4,6 +4,7 @@ config ADK_TARGET_SYSTEM_GENERIC_PC select ADK_generic_pc select ADK_CPU_I486 select ADK_TARGET_KERNEL_BZIMAGE + select ADK_PACKAGE_GRUB help Support for generic PC (i486). diff --git a/target/x86/sys-available/ibm-x40 b/target/x86/sys-available/ibm-x40 index 80c5bf531..df11b1f3f 100644 --- a/target/x86/sys-available/ibm-x40 +++ b/target/x86/sys-available/ibm-x40 @@ -21,6 +21,6 @@ config ADK_TARGET_SYSTEM_IBM_X40 select ADK_TARGET_WITH_PP select ADK_TARGET_WITH_ROOT_RW select ADK_TARGET_KERNEL_BZIMAGE - select ADK_PACKAGE_GRUB_BIN + select ADK_PACKAGE_GRUB help System profile for IBM X40 laptop. diff --git a/target/x86_64/Makefile b/target/x86_64/Makefile index c94c3a1a6..8d546a34b 100644 --- a/target/x86_64/Makefile +++ b/target/x86_64/Makefile @@ -8,6 +8,11 @@ include $(TOPDIR)/mk/kernel-build.mk include $(TOPDIR)/mk/image.mk KERNEL:=$(LINUX_DIR)/arch/x86/boot/bzImage +ifeq ($(ADK_TARGET_QEMU_WITH_BOOTLOADER),y) +CREATE:=./scripts/create.sh -g +else +CREATE:=./scripts/create.sh +endif ifeq ($(ADK_TARGET_FS),archive) imageinstall: $(FW_DIR)/$(ROOTFSTARBALL) @@ -15,11 +20,15 @@ imageinstall: $(FW_DIR)/$(ROOTFSTARBALL) ifeq ($(ADK_TARGET_SYSTEM_QEMU_X86_64),y) @cp $(KERNEL) $(FW_DIR)/$(TARGET_KERNEL) @echo "Use following command to create a QEMU Image:" - @echo "./scripts/create.sh qemu-${CPU_ARCH}.img $(FW_DIR)/$(ROOTFSTARBALL)" + @echo "$(CREATE) qemu-${CPU_ARCH}.img $(FW_DIR)/$(ROOTFSTARBALL)" @echo "Start qemu with following command line:" +ifeq ($(ADK_TARGET_QEMU_WITH_BOOTLOADER),y) + @echo 'qemu-system-x86_64 ${ADK_QEMU_ARGS} -net user -net nic,model=e1000 qemu-${CPU_ARCH}.img' +else @echo 'qemu-system-x86_64 ${ADK_QEMU_ARGS} -net user -net nic,model=e1000 -kernel $(FW_DIR)/$(TARGET_KERNEL) qemu-${CPU_ARCH}.img' endif endif +endif ifeq ($(ADK_TARGET_FS),initramfsarchive) imageinstall: $(FW_DIR)/$(ROOTFSUSERTARBALL) @cp $(KERNEL) $(FW_DIR)/$(TARGET_KERNEL) -- cgit v1.2.3 From 6f03e0cd975351c065d44fad8bc54b578a9c502e Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Mon, 14 Apr 2014 09:26:06 +0200 Subject: add serial command line flag --- package/grub/Makefile | 1 + target/x86_64/Makefile | 4 ++++ 2 files changed, 5 insertions(+) (limited to 'target') diff --git a/package/grub/Makefile b/package/grub/Makefile index e52980ce4..9e43242aa 100644 --- a/package/grub/Makefile +++ b/package/grub/Makefile @@ -17,6 +17,7 @@ PKG_ARCH_DEPENDS:= x86 x86_64 mips PKG_NOPARALLEL:= 1 PKG_SUBPKGS:= GRUB GRUB_TOOLS +PKGSD_GRUB_TOOLS:= GRUB2 tools PKG_CHOICES_GRUB:= PC EFI PKGCD_PC:= build for PC BIOS diff --git a/target/x86_64/Makefile b/target/x86_64/Makefile index 8d546a34b..63785c12a 100644 --- a/target/x86_64/Makefile +++ b/target/x86_64/Makefile @@ -9,7 +9,11 @@ include $(TOPDIR)/mk/image.mk KERNEL:=$(LINUX_DIR)/arch/x86/boot/bzImage ifeq ($(ADK_TARGET_QEMU_WITH_BOOTLOADER),y) +ifeq ($(ADK_TARGET_QEMU_WITHOUT_GRAPHIC),y) +CREATE:=./scripts/create.sh -g -t +else CREATE:=./scripts/create.sh -g +endif else CREATE:=./scripts/create.sh endif -- cgit v1.2.3 From 7209a2a3b092d9964a8c8aa48d2b8d1d42d41738 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Mon, 14 Apr 2014 14:39:11 +0200 Subject: compile patch when not available on Host --- README | 1 - mk/vars.mk | 2 +- package/patch/Makefile | 11 ++++++++--- scripts/scan-tools.sh | 13 +++++++------ target/config/Config.in.tools | 5 +++++ 5 files changed, 21 insertions(+), 11 deletions(-) (limited to 'target') diff --git a/README b/README index 81ebd7798..b35407944 100644 --- a/README +++ b/README @@ -12,7 +12,6 @@ Before you can start you need to install some tools: - GNU awk - GNU sed - tar -- patch - gzip - wget - libc headers diff --git a/mk/vars.mk b/mk/vars.mk index f3911044f..3ae3f1d67 100644 --- a/mk/vars.mk +++ b/mk/vars.mk @@ -168,7 +168,7 @@ CXXFLAGS_FOR_BUILD?= -O2 -Wall LDFLAGS_FOR_BUILD?= -L$(STAGING_HOST_DIR)/usr/lib FLAGS_FOR_BUILD= ${CPPFLAGS_FOR_BUILD} ${CFLAGS_FOR_BUILD} ${LDFLAGS_FOR_BUILD} -PATCH= ${BASH} $(SCRIPT_DIR)/patch.sh +PATCH= PATH=${HOST_PATH} ${BASH} $(SCRIPT_DIR)/patch.sh SED:= PATH=${HOST_PATH} sed -i -e LINUX_DIR:= $(BUILD_DIR)/linux KERNEL_MODULE_FLAGS:= ARCH=${ARCH} \ diff --git a/package/patch/Makefile b/package/patch/Makefile index 0d80e53ec..0d1e23448 100644 --- a/package/patch/Makefile +++ b/package/patch/Makefile @@ -4,20 +4,25 @@ include $(TOPDIR)/rules.mk PKG_NAME:= patch -PKG_VERSION:= 2.5.9 +PKG_VERSION:= 2.7.1 PKG_RELEASE:= 1 -PKG_MD5SUM:= dacfb618082f8d3a2194601193cf8716 -PKG_DESCR:= GNU patch +PKG_MD5SUM:= 95dd8d7e41dcbcecdd5cd88ef915378d +PKG_DESCR:= GNU patch utility PKG_SECTION:= utils PKG_URL:= http://www.gnu.org/software/patch/ PKG_SITES:= ${MASTER_SITE_GNU:=patch/} +include $(TOPDIR)/mk/host.mk include $(TOPDIR)/mk/package.mk +$(eval $(call HOST_template,PATCH,patch,$(PKG_VERSION)-${PKG_RELEASE})) $(eval $(call PKG_template,PATCH,patch,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +HOST_STYLE:= auto + patch-install: $(INSTALL_DIR) $(IDIR_PATCH)/usr/bin $(INSTALL_BIN) $(WRKINST)/usr/bin/patch $(IDIR_PATCH)/usr/bin +include ${TOPDIR}/mk/host-bottom.mk include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/scripts/scan-tools.sh b/scripts/scan-tools.sh index f513b5861..9bb713f6e 100644 --- a/scripts/scan-tools.sh +++ b/scripts/scan-tools.sh @@ -113,12 +113,6 @@ if ! which gzip >/dev/null 2>&1; then out=1 fi -if ! which patch >/dev/null 2>&1; then - echo You must install patch to continue. - echo - out=1 -fi - cat >test.c <<-'EOF' #include #include @@ -239,6 +233,12 @@ if ! which m4 >/dev/null 2>&1; then host_build_m4=1 fi +host_build_patch=0 +if ! which patch >/dev/null 2>&1; then + echo "No patch found, will build one." + host_build_patch=1 +fi + host_build_pkgconf=0 if ! which pkgconf >/dev/null 2>&1; then echo "No pkgconf found, will build one." @@ -317,6 +317,7 @@ if [ $host_build_bzip2 -eq 1 ];then printf "\t%s\n" "select ADK_HOST_BUILD_BZIP2 if [ $host_build_file -eq 1 ];then printf "\t%s\n" "select ADK_HOST_BUILD_FILE" >> $topdir/target/config/Config.in.prereq ;fi if [ $host_build_flex -eq 1 ];then printf "\t%s\n" "select ADK_HOST_BUILD_FLEX" >> $topdir/target/config/Config.in.prereq ;fi if [ $host_build_m4 -eq 1 ];then printf "\t%s\n" "select ADK_HOST_BUILD_M4" >> $topdir/target/config/Config.in.prereq ;fi +if [ $host_build_patch -eq 1 ];then printf "\t%s\n" "select ADK_HOST_BUILD_PATCH" >> $topdir/target/config/Config.in.prereq ;fi if [ $host_build_pkgconf -eq 1 ];then printf "\t%s\n" "select ADK_HOST_BUILD_PKGCONF" >> $topdir/target/config/Config.in.prereq ;fi if [ $host_build_findutils -eq 1 ];then printf "\t%s\n" "select ADK_HOST_BUILD_FINDUTILS" >> $topdir/target/config/Config.in.prereq ;fi if [ $host_build_xz -eq 1 ];then printf "\t%s\n" "select ADK_HOST_BUILD_XZ" >> $topdir/target/config/Config.in.prereq ;fi diff --git a/target/config/Config.in.tools b/target/config/Config.in.tools index b3e900bb3..d66a7e400 100644 --- a/target/config/Config.in.tools +++ b/target/config/Config.in.tools @@ -14,6 +14,7 @@ config ADK_HOST_BUILD_BASH config ADK_HOST_BUILD_BC boolean + select ADK_HOST_BUILD_FLEX default n config ADK_HOST_BUILD_BISON @@ -40,6 +41,10 @@ config ADK_HOST_BUILD_M4 boolean default n +config ADK_HOST_BUILD_PATCH + boolean + default n + config ADK_HOST_BUILD_PKGCONF boolean default n -- cgit v1.2.3