* [Buildroot] svn commit: trunk/buildroot/target: linux u-boot
@ 2009-01-26 10:38 ulf at uclibc.org
2009-01-26 10:49 ` Peter Korsgaard
2009-01-26 10:49 ` Peter Korsgaard
0 siblings, 2 replies; 5+ messages in thread
From: ulf at uclibc.org @ 2009-01-26 10:38 UTC (permalink / raw)
To: buildroot
Author: ulf
Date: 2009-01-26 10:38:00 +0000 (Mon, 26 Jan 2009)
New Revision: 25048
Log:
Revert bad patch to fix linux rebuild problem
Modified:
trunk/buildroot/target/linux/Makefile.in.advanced
trunk/buildroot/target/u-boot/Makefile.in
Changeset:
Modified: trunk/buildroot/target/linux/Makefile.in.advanced
===================================================================
--- trunk/buildroot/target/linux/Makefile.in.advanced 2009-01-26 09:22:52 UTC (rev 25047)
+++ trunk/buildroot/target/linux/Makefile.in.advanced 2009-01-26 10:38:00 UTC (rev 25048)
@@ -481,7 +481,7 @@
echo $(LINUX26_VERSION_PROBED) > $(PROJECT_BUILD_DIR)/.linux-version
echo LINUX_MODULES=`$(LINUX26_VERSION_PROBED)`
-$(LINUX26_MKIMAGE_DIR)/mkimage: $(MKIMAGE)
+$(LINUX26_MKIMAGE_DIR)/mkimage: u-boot
mkdir -p $(LINUX26_MKIMAGE_DIR)
cp $(MKIMAGE) $(LINUX26_MKIMAGE_DIR)
Modified: trunk/buildroot/target/u-boot/Makefile.in
===================================================================
--- trunk/buildroot/target/u-boot/Makefile.in 2009-01-26 09:22:52 UTC (rev 25047)
+++ trunk/buildroot/target/u-boot/Makefile.in 2009-01-26 10:38:00 UTC (rev 25048)
@@ -22,6 +22,7 @@
U_BOOT_AUTOSCRIPT=$(BINARIES_DIR)/autoscript
U_BOOT_TARGETS:=$(BINARIES_DIR)/$(U_BOOT_BIN) $(U_BOOT_TOOLS)
+#U_BOOT_TARGETS:=$(BINARIES_DIR)/$(U_BOOT_BIN)
ifeq ($(strip $(subst ",,$(BR2_TARGET_UBOOT_DEFAULT_ENV))),y)
#"))
@@ -289,7 +290,7 @@
#
#############################################################
ifeq ($(BR2_TARGET_UBOOT),y)
-TARGETS+=u-boot
+TARGETS+=u-boot mkimage
endif
u-boot-status:
^ permalink raw reply [flat|nested] 5+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/target: linux u-boot
2009-01-26 10:38 [Buildroot] svn commit: trunk/buildroot/target: linux u-boot ulf at uclibc.org
@ 2009-01-26 10:49 ` Peter Korsgaard
2009-01-26 11:40 ` Ulf Samuelsson
2009-01-26 10:49 ` Peter Korsgaard
1 sibling, 1 reply; 5+ messages in thread
From: Peter Korsgaard @ 2009-01-26 10:49 UTC (permalink / raw)
To: buildroot
>>>>> "ulf" == ulf <ulf@uclibc.org> writes:
ulf> Author: ulf
ulf> Date: 2009-01-26 10:38:00 +0000 (Mon, 26 Jan 2009)
ulf> New Revision: 25048
ulf> Log:
ulf> Revert bad patch to fix linux rebuild problem
ulf> -$(LINUX26_MKIMAGE_DIR)/mkimage: $(MKIMAGE)
ulf> +$(LINUX26_MKIMAGE_DIR)/mkimage: u-boot
ulf> mkdir -p $(LINUX26_MKIMAGE_DIR)
ulf> cp $(MKIMAGE) $(LINUX26_MKIMAGE_DIR)
Having an actual filename depending on a phony target seems wrong -
This will always be rebuilt.
ulf> U_BOOT_TARGETS:=$(BINARIES_DIR)/$(U_BOOT_BIN) $(U_BOOT_TOOLS)
ulf> +#U_BOOT_TARGETS:=$(BINARIES_DIR)/$(U_BOOT_BIN)
Why? Seems like you just broke the tools stuff.
ulf> ifeq ($(strip $(subst ",,$(BR2_TARGET_UBOOT_DEFAULT_ENV))),y)
ulf> #"))
ulf> @@ -289,7 +290,7 @@
ulf> #
ulf> #############################################################
ulf> ifeq ($(BR2_TARGET_UBOOT),y)
ulf> -TARGETS+=u-boot
ulf> +TARGETS+=u-boot mkimage
There afaik is no mkimage target.
Please fix.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 5+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/target: linux u-boot
2009-01-26 10:38 [Buildroot] svn commit: trunk/buildroot/target: linux u-boot ulf at uclibc.org
2009-01-26 10:49 ` Peter Korsgaard
@ 2009-01-26 10:49 ` Peter Korsgaard
1 sibling, 0 replies; 5+ messages in thread
From: Peter Korsgaard @ 2009-01-26 10:49 UTC (permalink / raw)
To: buildroot
>>>>> "ulf" == ulf <ulf@uclibc.org> writes:
ulf> Author: ulf
ulf> Date: 2009-01-26 10:38:00 +0000 (Mon, 26 Jan 2009)
ulf> New Revision: 25048
ulf> Log:
ulf> Revert bad patch to fix linux rebuild problem
Oh and don't call it a revert if it isn't one.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 5+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/target: linux u-boot
2009-01-26 10:49 ` Peter Korsgaard
@ 2009-01-26 11:40 ` Ulf Samuelsson
0 siblings, 0 replies; 5+ messages in thread
From: Ulf Samuelsson @ 2009-01-26 11:40 UTC (permalink / raw)
To: buildroot
m?n 2009-01-26 klockan 11:49 +0100 skrev Peter Korsgaard:
> >>>>> "ulf" == ulf <ulf@uclibc.org> writes:
>
> ulf> Author: ulf
> ulf> Date: 2009-01-26 10:38:00 +0000 (Mon, 26 Jan 2009)
> ulf> New Revision: 25048
>
> ulf> Log:
> ulf> Revert bad patch to fix linux rebuild problem
>
> ulf> -$(LINUX26_MKIMAGE_DIR)/mkimage: $(MKIMAGE)
> ulf> +$(LINUX26_MKIMAGE_DIR)/mkimage: u-boot
> ulf> mkdir -p $(LINUX26_MKIMAGE_DIR)
> ulf> cp $(MKIMAGE) $(LINUX26_MKIMAGE_DIR)
>
> Having an actual filename depending on a phony target seems wrong -
> This will always be rebuilt.
>
> ulf> U_BOOT_TARGETS:=$(BINARIES_DIR)/$(U_BOOT_BIN) $(U_BOOT_TOOLS)
> ulf> +#U_BOOT_TARGETS:=$(BINARIES_DIR)/$(U_BOOT_BIN)
>
> Why? Seems like you just broke the tools stuff.
As of yesterday part of linux26 is always rerun when you
do a make, and that was because of mkimage.
Tried to fix, but the fix worked only because
of things already built.
> ulf> ifeq ($(strip $(subst ",,$(BR2_TARGET_UBOOT_DEFAULT_ENV))),y)
> ulf> #"))
> ulf> @@ -289,7 +290,7 @@
> ulf> #
> ulf> #############################################################
> ulf> ifeq ($(BR2_TARGET_UBOOT),y)
> ulf> -TARGETS+=u-boot
> ulf> +TARGETS+=u-boot mkimage
>
> There afaik is no mkimage target.
>
> Please fix.
I removed that, the u-boot and linux directories
and reran make linux26 which seems to build and install.
Will have to run more tests to avoid the copy above and
the rebuild of linux.
BR
Ulf Samuelsson
>
^ permalink raw reply [flat|nested] 5+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/target: linux u-boot
@ 2009-02-06 17:38 correa at uclibc.org
0 siblings, 0 replies; 5+ messages in thread
From: correa at uclibc.org @ 2009-02-06 17:38 UTC (permalink / raw)
To: buildroot
Author: correa
Date: 2009-02-06 17:38:05 +0000 (Fri, 06 Feb 2009)
New Revision: 25258
Log:
Simplify kernel naming scheme. Only use kernel name plus the rootfs suffix if one is provided
Modified:
trunk/buildroot/target/linux/Makefile.in
trunk/buildroot/target/linux/Makefile.in.advanced
trunk/buildroot/target/u-boot/Makefile.in
Changeset:
Modified: trunk/buildroot/target/linux/Makefile.in
===================================================================
--- trunk/buildroot/target/linux/Makefile.in 2009-02-06 01:57:15 UTC (rev 25257)
+++ trunk/buildroot/target/linux/Makefile.in 2009-02-06 17:38:05 UTC (rev 25258)
@@ -67,9 +67,11 @@
endif
endif
+ROOTFS_STRIPPED_SUFFIX=$(strip $(subst ",,$(ROOTFS_SUFFIX)))
+#"))
# File name for the Linux kernel binary
ifndef LINUX26_KERNEL
-LINUX26_KERNEL=$(BINARIES_DIR)/linux-kernel-$(LINUX26_VERSION)-$(KERNEL_ARCH)
+LINUX26_KERNEL_NAME=$(BINARIES_DIR)/$(LINUX26_FORMAT)$(ROOTFS_STRIPPED_SUFFIX)
endif
# Version of Linux AFTER patches
@@ -78,7 +80,7 @@
# for packages that need it
LINUX_VERSION:=$(LINUX26_VERSION)
LINUX_DIR=$(LINUX26_DIR)
-LINUX_KERNEL=$(LINUX26_KERNEL)
+LINUX_KERNEL=$(LINUX26_KERNEL_NAME)
# kernel patches
ifeq ($(strip $(LINUX26_PATCH_DIR)),)
@@ -192,11 +194,11 @@
$(MAKE) $(LINUX26_MAKE_FLAGS) -C $(LINUX26_DIR) prepare
touch $@
-$(LINUX26_KERNEL): $(INITRAMFS_TARGET) $(BB_INITRAMFS_TARGET) \
+$(LINUX26_KERNEL_NAME): $(INITRAMFS_TARGET) $(BB_INITRAMFS_TARGET) \
$(LINUX26_DIR)/.depend_done
$(MAKE) $(LINUX26_MAKE_FLAGS) \
-C $(LINUX26_DIR) $(LINUX26_FORMAT)
- cp -pf $(LINUX26_DIR)/$(LINUX26_BINLOC) $(LINUX26_KERNEL)
+ cp -pf $(LINUX26_DIR)/$(LINUX26_BINLOC) $(LINUX26_KERNEL_NAME)
touch -c $@
$(TARGET_DIR)/lib/modules/$(LINUX26_VERSION)/modules.dep: $(LINUX26_DIR)/.configured
@@ -227,7 +229,7 @@
$(MAKE) $(LINUX26_MAKE_FLAGS) -C $(LINUX26_DIR) xconfig
-[ -f $(LINUX26_DIR)/.config ] && touch $(LINUX26_DIR)/.configured
-linux26: $(LINUX26_KERNEL)
+linux26: $(LINUX26_KERNEL_NAME)
$(LINUX26_DIR)/.modules_installed: $(TARGET_DIR)/lib/modules/$(LINUX26_VERSION)/modules.dep
touch $@
@@ -249,7 +251,7 @@
# This has been renamed so we do _NOT_ by default run this on 'make clean'
linux26clean:
- rm -f $(LINUX26_KERNEL) $(LINUX26_DIR)/.configured
+ rm -f $(LINUX26_KERNEL_NAME) $(LINUX26_DIR)/.configured
-$(MAKE) PATH=$(TARGET_PATH) -C $(LINUX26_DIR) clean
linux26-dirclean:
Modified: trunk/buildroot/target/linux/Makefile.in.advanced
===================================================================
--- trunk/buildroot/target/linux/Makefile.in.advanced 2009-02-06 01:57:15 UTC (rev 25257)
+++ trunk/buildroot/target/linux/Makefile.in.advanced 2009-02-06 17:38:05 UTC (rev 25258)
@@ -138,7 +138,6 @@
ifeq ($(LINUX26_BINLOC),)
LINUX26_BINLOC:=$(LINUX26_FORMAT)
endif
-KERNEL_EXT:=
endif
# --------------
@@ -149,7 +148,6 @@
ifeq ($(LINUX26_BINLOC),)
LINUX26_BINLOC:=arch/$(KERNEL_ARCH)/boot/$(LINUX26_FORMAT)
endif
-KERNEL_EXT:=.gz
endif
# --------------
@@ -158,7 +156,6 @@
ifeq ($(LINUX26_BINLOC),)
LINUX26_BINLOC:=arch/$(KERNEL_ARCH)/boot/$(LINUX26_FORMAT)
endif
-KERNEL_EXT:=.z
endif
# --------------
@@ -167,14 +164,13 @@
ifeq ($(LINUX26_BINLOC),)
LINUX26_BINLOC:=arch/$(KERNEL_ARCH)/boot/bzImage
endif
-KERNEL_EXT:=.bz
endif
ROOTFS_STRIPPED_SUFFIX=$(strip $(subst ",,$(ROOTFS_SUFFIX)))
#"))
# -----------------------------------------------------------------------------
# File name for the Linux kernel binary
-LINUX26_KERNEL_NAME:=$(BOARD_NAME)-linux-$(LINUX26_VERSION)$(ROOTFS_STRIPPED_SUFFIX)$(KERNEL_EXT)
+LINUX26_KERNEL_NAME:=$(LINUX26_FORMAT)$(ROOTFS_STRIPPED_SUFFIX)
ifeq ($(BOARD_NAME),)
@@ -182,7 +178,7 @@
endif
ifndef LINUX26_KERNEL
-LINUX26_KERNEL:=$(BINARIES_DIR)/$(BOARD_NAME)-linux-$(LINUX26_VERSION)-$(DATE)$(KERNEL_EXT)
+LINUX26_KERNEL:=$(BINARIES_DIR)/$(LINUX26_KERNEL_NAME)
endif
# for packages that need it
Modified: trunk/buildroot/target/u-boot/Makefile.in
===================================================================
--- trunk/buildroot/target/u-boot/Makefile.in 2009-02-06 01:57:15 UTC (rev 25257)
+++ trunk/buildroot/target/u-boot/Makefile.in 2009-02-06 17:38:05 UTC (rev 25258)
@@ -243,7 +243,7 @@
ifneq ($(TARGET_UBOOT_NETMASK),)
echo setenv netmask $(TARGET_UBOOT_NETMASK) >> $(U_BOOT_AUTOSCRIPT)
endif
- echo setenv linux $(LINUX26_KERNEL_NAME).gz >> $(U_BOOT_AUTOSCRIPT)
+ echo setenv linux $(LINUX26_KERNEL_NAME) >> $(U_BOOT_AUTOSCRIPT)
echo setenv kernel-version $(LINUX26_VERSION) >> $(U_BOOT_AUTOSCRIPT)
echo setenv kernel-date $(DATE) >> $(U_BOOT_AUTOSCRIPT)
echo setenv hostname $(TARGET_HOSTNAME) >> $(U_BOOT_AUTOSCRIPT)
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2009-02-06 17:38 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-01-26 10:38 [Buildroot] svn commit: trunk/buildroot/target: linux u-boot ulf at uclibc.org
2009-01-26 10:49 ` Peter Korsgaard
2009-01-26 11:40 ` Ulf Samuelsson
2009-01-26 10:49 ` Peter Korsgaard
-- strict thread matches above, loose matches on Subject: below --
2009-02-06 17:38 correa at uclibc.org
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox