* [Buildroot] svn commit: trunk/buildroot: target/linux toolchain/uClibc
@ 2007-09-28 16:18 ulf at uclibc.org
2007-09-28 16:58 ` Bernhard Fischer
0 siblings, 1 reply; 5+ messages in thread
From: ulf at uclibc.org @ 2007-09-28 16:18 UTC (permalink / raw)
To: buildroot
Author: ulf
Date: 2007-09-28 09:18:16 -0700 (Fri, 28 Sep 2007)
New Revision: 20085
Log:
Add administration for linux,uclibc and main
Modified:
trunk/buildroot/Makefile
trunk/buildroot/target/linux/Makefile.in
trunk/buildroot/toolchain/uClibc/uclibc.mk
Changeset:
Modified: trunk/buildroot/Makefile
===================================================================
--- trunk/buildroot/Makefile 2007-09-28 13:41:41 UTC (rev 20084)
+++ trunk/buildroot/Makefile 2007-09-28 16:18:16 UTC (rev 20085)
@@ -422,6 +422,10 @@
cp $(shell find ./target/ -name $@) .config
-@$(MAKE) oldconfig
+configured: dirs host-sed kernel-headers uclibc-configured busybox-config linux26-config
+
+cross: $(BASE_TARGETS)
+
help:
@echo 'Cleaning:'
@echo ' clean - delete temporary files created by build'
Modified: trunk/buildroot/target/linux/Makefile.in
===================================================================
--- trunk/buildroot/target/linux/Makefile.in 2007-09-28 13:41:41 UTC (rev 20084)
+++ trunk/buildroot/target/linux/Makefile.in 2007-09-28 16:18:16 UTC (rev 20085)
@@ -168,6 +168,8 @@
$(LINUX26_DIR)/.config
echo "CONFIG_INITRAMFS_ROOT_UID=0" >> $(LINUX26_DIR)/.config
echo "CONFIG_INITRAMFS_ROOT_GID=0" >> $(LINUX26_DIR)/.config
+else
+ echo "CONFIG_INITRAMFS_SOURCE=\"\"" >> $(LINUX26_DIR)/.config
endif
ifeq ($(BR2_PACKAGE_BUSYBOX_INITRAMFS),y)
# precedence for a small initramfs
@@ -225,7 +227,7 @@
linux26-unpacked: $(LINUX26_DIR)/.patched
-linux26-config: $(LINUX26_DIR)/.configured
+linux26-config: host-sed $(LINUX26_DIR)/.configured
linux26-update:
cp -dpf $(LINUX26_DIR)/.config $(LINUX26_KCONFIG)
Modified: trunk/buildroot/toolchain/uClibc/uclibc.mk
===================================================================
--- trunk/buildroot/toolchain/uClibc/uclibc.mk 2007-09-28 13:41:41 UTC (rev 20084)
+++ trunk/buildroot/toolchain/uClibc/uclibc.mk 2007-09-28 16:18:16 UTC (rev 20085)
@@ -108,8 +108,7 @@
UCLIBC_LOCALE_DATA=
endif
-uclibc-unpacked: $(UCLIBC_DIR)/.unpacked
-$(UCLIBC_DIR)/.unpacked: $(DL_DIR)/$(UCLIBC_SOURCE) $(UCLIBC_LOCALE_DATA)
+$(UCLIBC_DIR)/.unpacked: dirs kernel-headers host-sed $(DL_DIR)/$(UCLIBC_SOURCE) $(UCLIBC_LOCALE_DATA)
mkdir -p $(TOOL_BUILD_DIR)
rm -rf $(UCLIBC_DIR)
$(UCLIBC_CAT) $(DL_DIR)/$(UCLIBC_SOURCE) | tar -C $(TOOL_BUILD_DIR) $(TAR_OPTIONS) -
@@ -442,14 +441,16 @@
uclibc-source: $(DL_DIR)/$(UCLIBC_SOURCE)
-uclibc-config: host-sed $(UCLIBC_DIR)/.config
+uclibc-unpacked: $(UCLIBC_DIR)/.unpacked
-uclibc-oldconfig: host-sed $(UCLIBC_DIR)/.oldconfig
+uclibc-config: $(UCLIBC_DIR)/.config
-uclibc-update:
+uclibc-oldconfig: $(UCLIBC_DIR)/.oldconfig
+
+uclibc-update: uclibc-config
cp -f $(UCLIBC_DIR)/.config $(UCLIBC_CONFIG_FILE)
-uclibc-configured: kernel-headers $(UCLIBC_DIR)/.configured
+uclibc-configured: $(UCLIBC_DIR)/.configured
uclibc-configured-source: uclibc-source
^ permalink raw reply [flat|nested] 5+ messages in thread
* [Buildroot] svn commit: trunk/buildroot: target/linux toolchain/uClibc
2007-09-28 16:18 [Buildroot] svn commit: trunk/buildroot: target/linux toolchain/uClibc ulf at uclibc.org
@ 2007-09-28 16:58 ` Bernhard Fischer
2007-09-28 20:59 ` Ulf Samuelsson
0 siblings, 1 reply; 5+ messages in thread
From: Bernhard Fischer @ 2007-09-28 16:58 UTC (permalink / raw)
To: buildroot
On Fri, Sep 28, 2007 at 09:18:16AM -0700, ulf at uclibc.org wrote:
>Author: ulf
>Date: 2007-09-28 09:18:16 -0700 (Fri, 28 Sep 2007)
>New Revision: 20085
>
>Log:
>Add administration for linux,uclibc and main
>
>Modified:
> trunk/buildroot/Makefile
> trunk/buildroot/target/linux/Makefile.in
> trunk/buildroot/toolchain/uClibc/uclibc.mk
>
>
> cp $(shell find ./target/ -name $@) .config
> -@$(MAKE) oldconfig
>
>+configured: dirs host-sed kernel-headers uclibc-configured busybox-config linux26-config
This is not adequate (external binary toolchains). Please be careful
>--- trunk/buildroot/target/linux/Makefile.in 2007-09-28 13:41:41 UTC (rev 20084)
>+++ trunk/buildroot/target/linux/Makefile.in 2007-09-28 16:18:16 UTC (rev 20085)
>@@ -168,6 +168,8 @@
> $(LINUX26_DIR)/.config
> echo "CONFIG_INITRAMFS_ROOT_UID=0" >> $(LINUX26_DIR)/.config
> echo "CONFIG_INITRAMFS_ROOT_GID=0" >> $(LINUX26_DIR)/.config
>+else
>+ echo "CONFIG_INITRAMFS_SOURCE=\"\"" >> $(LINUX26_DIR)/.config
> endif
> ifeq ($(BR2_PACKAGE_BUSYBOX_INITRAMFS),y)
> # precedence for a small initramfs
>@@ -225,7 +227,7 @@
>
> linux26-unpacked: $(LINUX26_DIR)/.patched
>
>-linux26-config: $(LINUX26_DIR)/.configured
>+linux26-config: host-sed $(LINUX26_DIR)/.configured
Would have been nice if you had repaired that whitespace damage while
you touched that file..
>Modified: trunk/buildroot/toolchain/uClibc/uclibc.mk
>===================================================================
>--- trunk/buildroot/toolchain/uClibc/uclibc.mk 2007-09-28 13:41:41 UTC (rev 20084)
>+++ trunk/buildroot/toolchain/uClibc/uclibc.mk 2007-09-28 16:18:16 UTC (rev 20085)
>@@ -108,8 +108,7 @@
> UCLIBC_LOCALE_DATA=
> endif
>
>-uclibc-unpacked: $(UCLIBC_DIR)/.unpacked
>-$(UCLIBC_DIR)/.unpacked: $(DL_DIR)/$(UCLIBC_SOURCE) $(UCLIBC_LOCALE_DATA)
>+$(UCLIBC_DIR)/.unpacked: dirs kernel-headers host-sed $(DL_DIR)/$(UCLIBC_SOURCE) $(UCLIBC_LOCALE_DATA)
> mkdir -p $(TOOL_BUILD_DIR)
> rm -rf $(UCLIBC_DIR)
> $(UCLIBC_CAT) $(DL_DIR)/$(UCLIBC_SOURCE) | tar -C $(TOOL_BUILD_DIR) $(TAR_OPTIONS) -
>@@ -442,14 +441,16 @@
>
> uclibc-source: $(DL_DIR)/$(UCLIBC_SOURCE)
>
>-uclibc-config: host-sed $(UCLIBC_DIR)/.config
>+uclibc-unpacked: $(UCLIBC_DIR)/.unpacked
>
>-uclibc-oldconfig: host-sed $(UCLIBC_DIR)/.oldconfig
>+uclibc-config: $(UCLIBC_DIR)/.config
This whole block is suspicious. Previously, you could do a fresh
checkout and make uclibc-menuconfig and all was well, no superfluous
directories were made and all was clean, bright and shiny.
Please rethink this patch. A short glance leads me to believe that it's
not conceptually clean.
>
>-uclibc-update:
>+uclibc-oldconfig: $(UCLIBC_DIR)/.oldconfig
>+
>+uclibc-update: uclibc-config
> cp -f $(UCLIBC_DIR)/.config $(UCLIBC_CONFIG_FILE)
>
>-uclibc-configured: kernel-headers $(UCLIBC_DIR)/.configured
>+uclibc-configured: $(UCLIBC_DIR)/.configured
>
> uclibc-configured-source: uclibc-source
^ permalink raw reply [flat|nested] 5+ messages in thread
* [Buildroot] svn commit: trunk/buildroot: target/linux toolchain/uClibc
@ 2007-09-28 19:43 ulf at uclibc.org
0 siblings, 0 replies; 5+ messages in thread
From: ulf at uclibc.org @ 2007-09-28 19:43 UTC (permalink / raw)
To: buildroot
Author: ulf
Date: 2007-09-28 12:43:26 -0700 (Fri, 28 Sep 2007)
New Revision: 20088
Log:
Cleanup cross toolchain admin, split uclibc-menuconfig into same + uclibc-update to avoid overwriting board support file
Modified:
trunk/buildroot/Makefile
trunk/buildroot/target/linux/Makefile.in
trunk/buildroot/toolchain/uClibc/uclibc.mk
Changeset:
Modified: trunk/buildroot/Makefile
===================================================================
--- trunk/buildroot/Makefile 2007-09-28 17:17:08 UTC (rev 20087)
+++ trunk/buildroot/Makefile 2007-09-28 19:43:26 UTC (rev 20088)
@@ -422,7 +422,7 @@
cp $(shell find ./target/ -name $@) .config
-@$(MAKE) oldconfig
-configured: dirs host-sed kernel-headers uclibc-configured busybox-config linux26-config
+configured: dirs host-sed kernel-headers uclibc-config busybox-config linux26-config
cross: $(BASE_TARGETS)
Modified: trunk/buildroot/target/linux/Makefile.in
===================================================================
--- trunk/buildroot/target/linux/Makefile.in 2007-09-28 17:17:08 UTC (rev 20087)
+++ trunk/buildroot/target/linux/Makefile.in 2007-09-28 19:43:26 UTC (rev 20088)
@@ -227,7 +227,7 @@
linux26-unpacked: $(LINUX26_DIR)/.patched
-linux26-config: host-sed $(LINUX26_DIR)/.configured
+linux26-config: host-sed $(LINUX26_DIR)/.configured
linux26-update:
cp -dpf $(LINUX26_DIR)/.config $(LINUX26_KCONFIG)
Modified: trunk/buildroot/toolchain/uClibc/uclibc.mk
===================================================================
--- trunk/buildroot/toolchain/uClibc/uclibc.mk 2007-09-28 17:17:08 UTC (rev 20087)
+++ trunk/buildroot/toolchain/uClibc/uclibc.mk 2007-09-28 19:43:26 UTC (rev 20088)
@@ -108,7 +108,7 @@
UCLIBC_LOCALE_DATA=
endif
-$(UCLIBC_DIR)/.unpacked: dirs kernel-headers host-sed $(DL_DIR)/$(UCLIBC_SOURCE) $(UCLIBC_LOCALE_DATA)
+$(UCLIBC_DIR)/.unpacked: dirs host-sed $(DL_DIR)/$(UCLIBC_SOURCE) $(UCLIBC_LOCALE_DATA)
mkdir -p $(TOOL_BUILD_DIR)
rm -rf $(UCLIBC_DIR)
$(UCLIBC_CAT) $(DL_DIR)/$(UCLIBC_SOURCE) | tar -C $(TOOL_BUILD_DIR) $(TAR_OPTIONS) -
@@ -366,7 +366,6 @@
RUNTIME_PREFIX=$(TOOL_BUILD_DIR)/uClibc_dev/ \
HOSTCC="$(HOSTCC)" \
menuconfig && \
- cp -f $(UCLIBC_DIR)/.config $(UCLIBC_CONFIG_FILE) && \
touch -c $(UCLIBC_DIR)/.config
@@ -450,7 +449,7 @@
uclibc-update: uclibc-config
cp -f $(UCLIBC_DIR)/.config $(UCLIBC_CONFIG_FILE)
-uclibc-configured: $(UCLIBC_DIR)/.configured
+uclibc-configured: kernel-headers $(UCLIBC_DIR)/.configured
uclibc-configured-source: uclibc-source
^ permalink raw reply [flat|nested] 5+ messages in thread
* [Buildroot] svn commit: trunk/buildroot: target/linux toolchain/uClibc
2007-09-28 16:58 ` Bernhard Fischer
@ 2007-09-28 20:59 ` Ulf Samuelsson
2007-09-28 21:35 ` Bernhard Fischer
0 siblings, 1 reply; 5+ messages in thread
From: Ulf Samuelsson @ 2007-09-28 20:59 UTC (permalink / raw)
To: buildroot
fre 2007-09-28 klockan 18:58 +0200 skrev Bernhard Fischer:
> On Fri, Sep 28, 2007 at 09:18:16AM -0700, ulf at uclibc.org wrote:
> >Author: ulf
> >Date: 2007-09-28 09:18:16 -0700 (Fri, 28 Sep 2007)
> >New Revision: 20085
> >
> >Log:
> >Add administration for linux,uclibc and main
> >
> >Modified:
> > trunk/buildroot/Makefile
> > trunk/buildroot/target/linux/Makefile.in
> > trunk/buildroot/toolchain/uClibc/uclibc.mk
> >
> >
> > cp $(shell find ./target/ -name $@) .config
> > -@$(MAKE) oldconfig
> >
> >+configured: dirs host-sed kernel-headers uclibc-configured busybox-config linux26-config
>
> This is not adequate (external binary toolchains). Please be careful
>
The purpose of the thing is to untar all the packages needing
configuration, and the external binary toolchains does not need that.
Can you explain further?
> >--- trunk/buildroot/target/linux/Makefile.in 2007-09-28 13:41:41 UTC (rev 20084)
> >+++ trunk/buildroot/target/linux/Makefile.in 2007-09-28 16:18:16 UTC (rev 20085)
> >@@ -168,6 +168,8 @@
> > $(LINUX26_DIR)/.config
> > echo "CONFIG_INITRAMFS_ROOT_UID=0" >> $(LINUX26_DIR)/.config
> > echo "CONFIG_INITRAMFS_ROOT_GID=0" >> $(LINUX26_DIR)/.config
> >+else
> >+ echo "CONFIG_INITRAMFS_SOURCE=\"\"" >> $(LINUX26_DIR)/.config
> > endif
> > ifeq ($(BR2_PACKAGE_BUSYBOX_INITRAMFS),y)
> > # precedence for a small initramfs
> >@@ -225,7 +227,7 @@
> >
> > linux26-unpacked: $(LINUX26_DIR)/.patched
> >
> >-linux26-config: $(LINUX26_DIR)/.configured
> >+linux26-config: host-sed $(LINUX26_DIR)/.configured
>
> Would have been nice if you had repaired that whitespace damage while
> you touched that file..
We should go out drinking, since you are picking up all the tabs :-)
I'll fix that...
>
> >Modified: trunk/buildroot/toolchain/uClibc/uclibc.mk
> >===================================================================
> >--- trunk/buildroot/toolchain/uClibc/uclibc.mk 2007-09-28 13:41:41 UTC (rev 20084)
> >+++ trunk/buildroot/toolchain/uClibc/uclibc.mk 2007-09-28 16:18:16 UTC (rev 20085)
> >@@ -108,8 +108,7 @@
> > UCLIBC_LOCALE_DATA=
> > endif
> >
> >-uclibc-unpacked: $(UCLIBC_DIR)/.unpacked
> >-$(UCLIBC_DIR)/.unpacked: $(DL_DIR)/$(UCLIBC_SOURCE) $(UCLIBC_LOCALE_DATA)
> >+$(UCLIBC_DIR)/.unpacked: dirs kernel-headers host-sed $(DL_DIR)/$(UCLIBC_SOURCE) $(UCLIBC_LOCALE_DATA)
> > mkdir -p $(TOOL_BUILD_DIR)
> > rm -rf $(UCLIBC_DIR)
> > $(UCLIBC_CAT) $(DL_DIR)/$(UCLIBC_SOURCE) | tar -C $(TOOL_BUILD_DIR) $(TAR_OPTIONS) -
> >@@ -442,14 +441,16 @@
> >
> > uclibc-source: $(DL_DIR)/$(UCLIBC_SOURCE)
> >
> >-uclibc-config: host-sed $(UCLIBC_DIR)/.config
> >+uclibc-unpacked: $(UCLIBC_DIR)/.unpacked
> >
> >-uclibc-oldconfig: host-sed $(UCLIBC_DIR)/.oldconfig
> >+uclibc-config: $(UCLIBC_DIR)/.config
>
> This whole block is suspicious. Previously, you could do a fresh
> checkout and make uclibc-menuconfig and all was well, no superfluous
> directories were made and all was clean, bright and shiny.
>
> Please rethink this patch. A short glance leads me to believe that it's
> not conceptually clean.
> >
It is a matter of taste.
If you do
make menuconfig
make uclibc-menuconfig
The previous behaviour would allow you to do the menuconfig immediately.
The current behavour will start the build so that it is more or
less equivalent to the position it would be if you type "make"
and the build stopped just before uclibc-configuration.
Everything in the config aadministration becomes easier
if the unpack stuff depends on the dirs, and host-sed,
but it may make sense to remove the kernel headers.
uclibc-configured used to depend on kernel-headers,
but I do not understand why, right now.
$(UCLIBC_DIR)/.configured already depend on
$(LINUX_HEADERS_DIR)/.configured
> >-uclibc-update:
> >+uclibc-oldconfig: $(UCLIBC_DIR)/.oldconfig
> >+
> >+uclibc-update: uclibc-config
> > cp -f $(UCLIBC_DIR)/.config $(UCLIBC_CONFIG_FILE)
> >
> >-uclibc-configured: kernel-headers $(UCLIBC_DIR)/.configured
> >+uclibc-configured: $(UCLIBC_DIR)/.configured
> >
> > uclibc-configured-source: uclibc-source
^ permalink raw reply [flat|nested] 5+ messages in thread
* [Buildroot] svn commit: trunk/buildroot: target/linux toolchain/uClibc
2007-09-28 20:59 ` Ulf Samuelsson
@ 2007-09-28 21:35 ` Bernhard Fischer
0 siblings, 0 replies; 5+ messages in thread
From: Bernhard Fischer @ 2007-09-28 21:35 UTC (permalink / raw)
To: buildroot
On Fri, Sep 28, 2007 at 10:59:22PM +0200, Ulf Samuelsson wrote:
>fre 2007-09-28 klockan 18:58 +0200 skrev Bernhard Fischer:
>> On Fri, Sep 28, 2007 at 09:18:16AM -0700, ulf at uclibc.org wrote:
>> >Author: ulf
>> >Date: 2007-09-28 09:18:16 -0700 (Fri, 28 Sep 2007)
>> >New Revision: 20085
>> >
>> >Log:
>> >Add administration for linux,uclibc and main
>> >
>> >Modified:
>> > trunk/buildroot/Makefile
>> > trunk/buildroot/target/linux/Makefile.in
>> > trunk/buildroot/toolchain/uClibc/uclibc.mk
>> >
>> >
>> > cp $(shell find ./target/ -name $@) .config
>> > -@$(MAKE) oldconfig
>> >
>> >+configured: dirs host-sed kernel-headers uclibc-configured busybox-config linux26-config
>>
>> This is not adequate (external binary toolchains). Please be careful
>>
>The purpose of the thing is to untar all the packages needing
>configuration, and the external binary toolchains does not need that.
>Can you explain further?
Will this work for external binary toolchains? I'm not sure if all of
those are wrapped in guards (and no, don't add them, please), so it
has to have different prerequisites depending on this fact.
>> Would have been nice if you had repaired that whitespace damage while
>> you touched that file..
>
>We should go out drinking, since you are picking up all the tabs :-)
;)
>I'll fix that...
You already did, thanks.
>> This whole block is suspicious. Previously, you could do a fresh
>> checkout and make uclibc-menuconfig and all was well, no superfluous
>> directories were made and all was clean, bright and shiny.
>
>>
>> Please rethink this patch. A short glance leads me to believe that it's
>> not conceptually clean.
>> >
>
>
>It is a matter of taste.
>If you do
>make menuconfig
>make uclibc-menuconfig
>
>The previous behaviour would allow you to do the menuconfig immediately.
Yes, and this is a feature. Please make sure that you don't add a
regression in this area.
>The current behavour will start the build so that it is more or
>less equivalent to the position it would be if you type "make"
>and the build stopped just before uclibc-configuration.
Yes, this is a bug. There is no need to waste my time nor disk-space
until i can start to configure buildroot, busybox, uclibc or the kernel.
>Everything in the config aadministration becomes easier
>if the unpack stuff depends on the dirs, and host-sed,
>but it may make sense to remove the kernel headers.
>
>uclibc-configured used to depend on kernel-headers,
>but I do not understand why, right now.
uclibc-configured is just a short-hand for convenience.
Please read the uclibc.mk and understand it's interaction with the
kernel-headers. Before you do this, please revert the patch above and
play with it locally.
>$(UCLIBC_DIR)/.configured already depend on
>$(LINUX_HEADERS_DIR)/.configured
TIA,
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2007-09-28 21:35 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-09-28 16:18 [Buildroot] svn commit: trunk/buildroot: target/linux toolchain/uClibc ulf at uclibc.org
2007-09-28 16:58 ` Bernhard Fischer
2007-09-28 20:59 ` Ulf Samuelsson
2007-09-28 21:35 ` Bernhard Fischer
-- strict thread matches above, loose matches on Subject: below --
2007-09-28 19:43 ulf 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