linux-kernel - [PATCH] [RFC] initramfs: Prefix simple paths with $(srctree)

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Date:	Thu, 14 Nov 2013 23:14:43 +0100
From:	Geert Uytterhoeven <geert@...ux-m68k.org>
To:	Jonas Bonn <jonas@...thpole.se>, linux-kbuild@...r.kernel.org
Cc:	linux@...ts.openrisc.net, linux-kernel@...r.kernel.org,
	Geert Uytterhoeven <geert@...ux-m68k.org>
Subject: [PATCH] [RFC] initramfs: Prefix simple paths with $(srctree)

If CONFIG_INITRAMFS_SOURCE contains relative paths inside the source tree
(e.g. in a defconfig pointing to arch-specific files), the corresponding
file system entries are not found when building outside the source tree.

Prefix all simple paths (paths not starting with "/", "../", or "./") with
$(srctree) to fix this.

Signed-off-by: Geert Uytterhoeven <geert@...ux-m68k.org>
---
This issue happens when building an OpenRISC defconfig from
git://openrisc.net/jonas/linux. Mainline doesn't have the OpenRISC
initramfs.

Questions:
  1. Is this an acceptable solution for mainline?
  2. My make-foo is limited. is there a better way to accomplish this, than
     by prefixing all paths and removing the prefixes again where they're
     not wanted?
   
 usr/Makefile |    6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/usr/Makefile b/usr/Makefile
index e767f019accf..2170c38936ce 100644
--- a/usr/Makefile
+++ b/usr/Makefile
@@ -41,6 +41,12 @@ hostprogs-y := gen_init_cpio
 initramfs   := $(CONFIG_SHELL) $(srctree)/scripts/gen_initramfs_list.sh
 ramfs-input := $(if $(filter-out "",$(CONFIG_INITRAMFS_SOURCE)), \
 			$(shell echo $(CONFIG_INITRAMFS_SOURCE)),-d)
+ifneq ("$(ramfs-input)", "-d")
+ramfs-input := $(patsubst %, $(srctree)/%, $(ramfs-input))
+ramfs-input := $(patsubst $(srctree)//%, /%, $(ramfs-input))
+ramfs-input := $(patsubst $(srctree)/../%, ../%, $(ramfs-input))
+ramfs-input := $(patsubst $(srctree)/./%, ./%, $(ramfs-input))
+endif
 ramfs-args  := \
         $(if $(CONFIG_INITRAMFS_ROOT_UID), -u $(CONFIG_INITRAMFS_ROOT_UID)) \
         $(if $(CONFIG_INITRAMFS_ROOT_GID), -g $(CONFIG_INITRAMFS_ROOT_GID))
-- 
1.7.9.5

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/