* [Buildroot] [PATCH 1/4] toolchain/uClibc: ensure .oldconfig is writable
2013-05-27 10:36 [Buildroot] [pull request] Pull request for branch yem-patchwork-fixes Yann E. MORIN
@ 2013-05-27 10:36 ` Yann E. MORIN
2013-05-27 10:36 ` [Buildroot] [PATCH 2/4] target: ensure target/ dir " Yann E. MORIN
` (3 subsequent siblings)
4 siblings, 0 replies; 7+ messages in thread
From: Yann E. MORIN @ 2013-05-27 10:36 UTC (permalink / raw)
To: buildroot
From: Nathan Lynch <ntl@pobox.com>
If $(UCLIBC_CONFIG_FILE) is read-only (eg. because Buildroot's
source dir is), the sed fixups to .oldconfig fail.
Signed-off-by: Nathan Lynch <ntl@pobox.com>
[yann.morin.1998 at free.fr: use $(INSTALL) instead of cp]
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
---
toolchain/uClibc/uclibc.mk | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/toolchain/uClibc/uclibc.mk b/toolchain/uClibc/uclibc.mk
index d4f1d4c..1a9934d 100644
--- a/toolchain/uClibc/uclibc.mk
+++ b/toolchain/uClibc/uclibc.mk
@@ -94,7 +94,7 @@ endif
# Some targets may wish to provide their own UCLIBC_CONFIG_FILE...
$(UCLIBC_DIR)/.oldconfig: $(UCLIBC_DIR)/.patched $(UCLIBC_CONFIG_FILE)
$(Q)$(call MESSAGE,"Pre-configuring uClibc")
- cp -f $(UCLIBC_CONFIG_FILE) $(UCLIBC_DIR)/.oldconfig
+ $(INSTALL) -D -m 0644 $(UCLIBC_CONFIG_FILE) $(UCLIBC_DIR)/.oldconfig
$(SED) 's,^CROSS_COMPILER_PREFIX=.*,CROSS_COMPILER_PREFIX="$(TARGET_CROSS)",g' \
-e 's,# TARGET_$(UCLIBC_TARGET_ARCH) is not set,TARGET_$(UCLIBC_TARGET_ARCH)=y,g' \
-e 's,^TARGET_ARCH=".*",TARGET_ARCH=\"$(UCLIBC_TARGET_ARCH)\",g' \
--
1.8.1.2
^ permalink raw reply related [flat|nested] 7+ messages in thread* [Buildroot] [PATCH 2/4] target: ensure target/ dir is writable
2013-05-27 10:36 [Buildroot] [pull request] Pull request for branch yem-patchwork-fixes Yann E. MORIN
2013-05-27 10:36 ` [Buildroot] [PATCH 1/4] toolchain/uClibc: ensure .oldconfig is writable Yann E. MORIN
@ 2013-05-27 10:36 ` Yann E. MORIN
2013-05-27 10:36 ` [Buildroot] [PATCH 3/4] busybox: ensure $(BUSYBOX_BUILD_CONFIG) " Yann E. MORIN
` (2 subsequent siblings)
4 siblings, 0 replies; 7+ messages in thread
From: Yann E. MORIN @ 2013-05-27 10:36 UTC (permalink / raw)
To: buildroot
From: Nathan Lynch <ntl@pobox.com>
If the source target skeleton is read-only (eg. because Buildroot's
source dir is), modifications to the output target (such as creating
/etc/hostname and /etc/issue) fail.
Signed-off-by: Nathan Lynch <ntl@pobox.com>
[yann.morin.1998 at free.fr: we use rsync now, not cp; --chmod=Du+w
suggested by Arnout; clarify commit log]
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Arnout Vandecappelle <arnout@mind.be>
---
Makefile | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Makefile b/Makefile
index e8647d1..2a62a65 100644
--- a/Makefile
+++ b/Makefile
@@ -431,7 +431,7 @@ endif
$(BUILD_DIR)/.root:
mkdir -p $(TARGET_DIR)
- rsync -a \
+ rsync -a --chmod=Du+w \
--exclude .empty --exclude .svn --exclude .git \
--exclude .hg --exclude=CVS --exclude '*~' \
$(TARGET_SKELETON)/ $(TARGET_DIR)/
@@ -507,7 +507,7 @@ endif
@$(foreach d, $(call qstrip,$(BR2_ROOTFS_OVERLAY)), \
$(call MESSAGE,"Copying overlay $(d)"); \
- rsync -a \
+ rsync -a --chmod=Du+w \
--exclude .empty --exclude .svn --exclude .git \
--exclude .hg --exclude=CVS --exclude '*~' \
$(d)/ $(TARGET_DIR)$(sep))
--
1.8.1.2
^ permalink raw reply related [flat|nested] 7+ messages in thread* [Buildroot] [PATCH 3/4] busybox: ensure $(BUSYBOX_BUILD_CONFIG) is writable
2013-05-27 10:36 [Buildroot] [pull request] Pull request for branch yem-patchwork-fixes Yann E. MORIN
2013-05-27 10:36 ` [Buildroot] [PATCH 1/4] toolchain/uClibc: ensure .oldconfig is writable Yann E. MORIN
2013-05-27 10:36 ` [Buildroot] [PATCH 2/4] target: ensure target/ dir " Yann E. MORIN
@ 2013-05-27 10:36 ` Yann E. MORIN
2013-05-27 10:36 ` [Buildroot] [PATCH 4/4] linux: ensure buildroot_defconfig " Yann E. MORIN
2013-06-03 22:11 ` [Buildroot] [pull request] Pull request for branch yem-patchwork-fixes Yann E. MORIN
4 siblings, 0 replies; 7+ messages in thread
From: Yann E. MORIN @ 2013-05-27 10:36 UTC (permalink / raw)
To: buildroot
From: Nathan Lynch <ntl@pobox.com>
If $(BUSYBOX_CONFIG_FILE) is read-only (eg. because Buildroot's
source dir is), the sed fixups to $(BUSYBOX_BUILD_CONFIG) fail.
Signed-off-by: Nathan Lynch <ntl@pobox.com>
[yann.morin.1998 at free.fr: use $(INSTALL) instead of cp]
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Arnout Vandecappelle <arnout@mind.be>
---
package/busybox/busybox.mk | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk
index 985203c..0b6c18f 100644
--- a/package/busybox/busybox.mk
+++ b/package/busybox/busybox.mk
@@ -123,7 +123,7 @@ endef
endif
define BUSYBOX_COPY_CONFIG
- cp -f $(BUSYBOX_CONFIG_FILE) $(BUSYBOX_BUILD_CONFIG)
+ $(INSTALL) -D -m 0644 $(BUSYBOX_CONFIG_FILE) $(BUSYBOX_BUILD_CONFIG)
endef
# Disable shadow passwords support if unsupported by the C library
--
1.8.1.2
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [Buildroot] [PATCH 4/4] linux: ensure buildroot_defconfig is writable
2013-05-27 10:36 [Buildroot] [pull request] Pull request for branch yem-patchwork-fixes Yann E. MORIN
` (2 preceding siblings ...)
2013-05-27 10:36 ` [Buildroot] [PATCH 3/4] busybox: ensure $(BUSYBOX_BUILD_CONFIG) " Yann E. MORIN
@ 2013-05-27 10:36 ` Yann E. MORIN
2013-06-03 22:11 ` [Buildroot] [pull request] Pull request for branch yem-patchwork-fixes Yann E. MORIN
4 siblings, 0 replies; 7+ messages in thread
From: Yann E. MORIN @ 2013-05-27 10:36 UTC (permalink / raw)
To: buildroot
From: Nathan Lynch <ntl@pobox.com>
If $(KERNEL_SOURCE_CONFIG) is read-only (eg. becasue Buildroot's source
dir is), the rm of $(KERNEL_ARCH_PATH)/configs/buildroot_defconfig will
prompt the user. Make it writable and use rm -f for good measure.
Signed-off-by: Nathan Lynch <ntl@pobox.com>
[yann.morin.1998 at free.fr: use $(INSTALL) instead of cp]
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
---
linux/linux.mk | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/linux/linux.mk b/linux/linux.mk
index 3877c35..5b8f211 100644
--- a/linux/linux.mk
+++ b/linux/linux.mk
@@ -166,9 +166,9 @@ KERNEL_SOURCE_CONFIG = $(BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE)
endif
define LINUX_CONFIGURE_CMDS
- cp $(KERNEL_SOURCE_CONFIG) $(KERNEL_ARCH_PATH)/configs/buildroot_defconfig
+ $(INSTALL) -D -m 0644 $(KERNEL_SOURCE_CONFIG) $(KERNEL_ARCH_PATH)/configs/buildroot_defconfig
$(TARGET_MAKE_ENV) $(MAKE1) $(LINUX_MAKE_FLAGS) -C $(@D) buildroot_defconfig
- rm $(KERNEL_ARCH_PATH)/configs/buildroot_defconfig
+ rm -f $(KERNEL_ARCH_PATH)/configs/buildroot_defconfig
$(if $(BR2_ARM_EABI),
$(call KCONFIG_ENABLE_OPT,CONFIG_AEABI,$(@D)/.config),
$(call KCONFIG_DISABLE_OPT,CONFIG_AEABI,$(@D)/.config))
--
1.8.1.2
^ permalink raw reply related [flat|nested] 7+ messages in thread* [Buildroot] [pull request] Pull request for branch yem-patchwork-fixes
2013-05-27 10:36 [Buildroot] [pull request] Pull request for branch yem-patchwork-fixes Yann E. MORIN
` (3 preceding siblings ...)
2013-05-27 10:36 ` [Buildroot] [PATCH 4/4] linux: ensure buildroot_defconfig " Yann E. MORIN
@ 2013-06-03 22:11 ` Yann E. MORIN
2013-06-04 22:05 ` Yann E. MORIN
4 siblings, 1 reply; 7+ messages in thread
From: Yann E. MORIN @ 2013-06-03 22:11 UTC (permalink / raw)
To: buildroot
All,
On 2013-05-27 12:36 +0200, Yann E. MORIN spake thusly:
> From: "Yann E. MORIN" <yann.morin.1998@free.fr>
>
> Hello All!
>
> Here are four patches from Nathan Lynch to fix building out-of-tree
> when the Buildroot source tree is readonly (eg. shared via NFS between
> multiple developers).
Ping? I'm trying to check bug #5780, but can't go that far, since
target/ is readonly, which is fixed by one of these patches.
> ----------------------------------------------------------------
> Nathan Lynch (4):
> toolchain/uClibc: ensure .oldconfig is writable
> target: ensure target/ dir is writable
> busybox: ensure $(BUSYBOX_BUILD_CONFIG) is writable
> linux: ensure buildroot_defconfig is writable
Regards,
Yann E. MORIN.
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply [flat|nested] 7+ messages in thread* [Buildroot] [pull request] Pull request for branch yem-patchwork-fixes
2013-06-03 22:11 ` [Buildroot] [pull request] Pull request for branch yem-patchwork-fixes Yann E. MORIN
@ 2013-06-04 22:05 ` Yann E. MORIN
0 siblings, 0 replies; 7+ messages in thread
From: Yann E. MORIN @ 2013-06-04 22:05 UTC (permalink / raw)
To: buildroot
All,
On 2013-06-04 00:11 +0200, Yann E. MORIN spake thusly:
> On 2013-05-27 12:36 +0200, Yann E. MORIN spake thusly:
> > From: "Yann E. MORIN" <yann.morin.1998@free.fr>
> >
> > Hello All!
> >
> > Here are four patches from Nathan Lynch to fix building out-of-tree
> > when the Buildroot source tree is readonly (eg. shared via NFS between
> > multiple developers).
>
> Ping? I'm trying to check bug #5780, but can't go that far, since
> target/ is readonly, which is fixed by one of these patches.
Well, forget this series, I've uncovered a remaining issue.
(Peter: I've marked it as "Changes Requested" in the Patchwork ;-) )
Sorry... :-/
Regards,
Yann E. MORIN.
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply [flat|nested] 7+ messages in thread