浏览代码

Prevent patch commands from accessing source control

Closes #4357

Add -g0 option to patch to ensure it doesn't try to access source control.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
Danomi Mocelopolis 13 年之前
父节点
当前提交
ec02a34b0a
共有 3 个文件被更改,包括 3 次插入2 次删除
  1. 1 0
      CHANGES
  2. 1 1
      boot/grub/grub.mk
  3. 1 1
      support/scripts/apply-patches.sh

+ 1 - 0
CHANGES

@@ -11,6 +11,7 @@
 
 	Issues resolved (http://bugs.uclibc.org):
 
+	#4357: Prevent patch commands from accessing source control
 	#4369: Fix permissions on untared lsof archive
 
 2011.11-rc2, Released November 18th, 2011:

+ 1 - 1
boot/grub/grub.mk

@@ -41,7 +41,7 @@ GRUB_CONFIG-$(BR2_TARGET_GRUB_w89c840) += --enable-w89c840
 define GRUB_DEBIAN_PATCHES
 	# Apply the patches from the Debian patch
 	(cd $(@D) ; for f in `cat debian/patches/00list | grep -v ^#` ; do \
-		cat debian/patches/$$f | patch -p1 ; \
+		cat debian/patches/$$f | patch -g0 -p1 ; \
 	done)
 endef
 

+ 1 - 1
support/scripts/apply-patches.sh

@@ -21,7 +21,7 @@ if [ ! -d "${patchdir}" ] ; then
 fi
     
 for i in `cd ${patchdir}; ls -d ${patchpattern} 2> /dev/null` ; do 
-    apply="patch -p1 -E -d"
+    apply="patch -g0 -p1 -E -d"
     uncomp_parm=""
     if [ -d "${patchdir}/$i" ] ; then
 	type="directory overlay"