Commit 7a58ed73 authored by Peter Korsgaard's avatar Peter Korsgaard
Browse files

Merge branch 'next'

parents 9fc43591 97165f12

Makefile

+11 −3
Original line number Diff line number Diff line
@@ -368,7 +368,7 @@ $(TARGETS_ALL): __real_tgt_%: $(BASE_TARGETS) % 
dirs: $(DL_DIR) $(TOOLCHAIN_DIR) $(BUILD_DIR) $(STAGING_DIR) $(TARGET_DIR) \

	$(HOST_DIR) $(BINARIES_DIR) $(STAMP_DIR)



$(BASE_TARGETS): dirs $(O)/toolchainfile.cmake

$(BASE_TARGETS): dirs $(HOST_DIR)/usr/share/buildroot/toolchainfile.cmake



$(BUILD_DIR)/buildroot-config/auto.conf: $(CONFIG_DIR)/.config

	$(MAKE) $(EXTRAMAKEARGS) HOSTCC="$(HOSTCC_NOCCACHE)" HOSTCXX="$(HOSTCXX_NOCCACHE)" silentoldconfig
@@ -377,7 +377,8 @@ prepare: $(BUILD_DIR)/buildroot-config/auto.conf 


world: prepare dirs dependencies $(BASE_TARGETS) $(TARGETS_ALL)



$(O)/toolchainfile.cmake:

$(HOST_DIR)/usr/share/buildroot/toolchainfile.cmake:

	mkdir -p $(@D)

	@echo -en "\

	set(CMAKE_SYSTEM_NAME Linux)\n\

	set(CMAKE_C_COMPILER $(TARGET_CC_NOCCACHE))\n\
@@ -477,9 +478,16 @@ endif 
	else \

		/sbin/ldconfig -r $(TARGET_DIR); \

	fi

	echo $(BR2_VERSION_FULL) > $(TARGET_DIR)/etc/br-version

	( \

		echo "NAME=Buildroot"; \

		echo "VERSION=$(BR2_VERSION_FULL)"; \

		echo "ID=buildroot"; \

		echo "VERSION_ID=$(BR2_VERSION)"; \

		echo "PRETTY_NAME=\"Buildroot $(BR2_VERSION)\"" \

	) >  $(TARGET_DIR)/etc/os-release



ifneq ($(BR2_ROOTFS_POST_BUILD_SCRIPT),"")

	@$(call MESSAGE,"Executing post-build script")

	$(BR2_ROOTFS_POST_BUILD_SCRIPT) $(TARGET_DIR)

endif

configs/mx53loco_defconfig

0 → 100644
+23 −0
Original line number Diff line number Diff line 
# Architecture

BR2_arm=y

BR2_cortex_a8=y

# BR2_SOFT_FLOAT is not set

BR2_VFP_FLOAT=y



# System

BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0"

BR2_TARGET_UBOOT=y

BR2_TARGET_UBOOT_BOARDNAME="mx53_loco"

BR2_TARGET_UBOOT_CUSTOM_GIT=y

BR2_TARGET_UBOOT_CUSTOM_GIT_REPO_URL="git://git.freescale.com/imx/uboot-imx.git"

BR2_TARGET_UBOOT_CUSTOM_GIT_VERSION="rel_imx_2.6.35_11.09.01"



# filesystem

BR2_TARGET_ROOTFS_EXT2=y



# Kernel

BR2_LINUX_KERNEL=y

BR2_LINUX_KERNEL_CUSTOM_GIT=y

BR2_LINUX_KERNEL_CUSTOM_GIT_REPO_URL="git://git.freescale.com/imx/linux-2.6-imx.git"

BR2_LINUX_KERNEL_CUSTOM_GIT_VERSION="rel_imx_2.6.35_11.09.01"

BR2_LINUX_KERNEL_DEFCONFIG="imx5"

package/Config.in

+1 −0
Original line number Diff line number Diff line
@@ -344,6 +344,7 @@ source "package/jsmin/Config.in" 
endmenu



menu "Networking"

source "package/glib-networking/Config.in"

source "package/libcgi/Config.in"

source "package/libcgicc/Config.in"

source "package/libcurl/Config.in"

package/Makefile.cmake.in

+1 −1
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ define $(2)_CONFIGURE_CMDS 
	(cd $$($$(PKG)_BUILDDIR) && \

	rm -f CMakeCache.txt && \

	$$($$(PKG)_CONF_ENV) $(HOST_DIR)/usr/bin/cmake $$($$(PKG)_SRCDIR) \

		-DCMAKE_TOOLCHAIN_FILE="$$(BASE_DIR)/toolchainfile.cmake" \

		-DCMAKE_TOOLCHAIN_FILE="$$(HOST_DIR)/usr/share/buildroot/toolchainfile.cmake" \

		-DCMAKE_INSTALL_PREFIX="/usr" \

		$$($$(PKG)_CONF_OPT) \

	)

package/Makefile.package.in

+1 −1
Original line number Diff line number Diff line
@@ -238,7 +238,7 @@ endef 


define DOWNLOAD_WGET

	test -e $(DL_DIR)/$(2) || \

	$(WGET) -P $(DL_DIR) $(call qstrip,$(1))/$(2)

	$(WGET) -O $(DL_DIR)/$(2) $(call qstrip,$(1))/$(2)

endef



define SOURCE_CHECK_WGET