From c398fa8948567a7322f3a56ce0f2d41a514e06be Mon Sep 17 00:00:00 2001
From: Christian Wiese <morfoh@opensde.org>
Date: Sun, 21 Oct 2007 05:59:57 +0300
Subject: [PATCH] Changed the pattern to find the pure64 or multilib patches

- The formely pattern used $pkg-$ver, which turned out to be
  a bit too strict.
---
 architecture/x86-64/pkg_gcc_post.conf   | 11 ++++++-----
 architecture/x86-64/pkg_glibc_post.conf | 18 ++++++++++++++++--
 2 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/architecture/x86-64/pkg_gcc_post.conf b/architecture/x86-64/pkg_gcc_post.conf
index e76abee..e3104a1 100644
--- a/architecture/x86-64/pkg_gcc_post.conf
+++ b/architecture/x86-64/pkg_gcc_post.conf
@@ -1,7 +1,8 @@
-# --- T2-COPYRIGHT-NOTE-BEGIN ---
+# --- SDE-COPYRIGHT-NOTE-BEGIN ---
 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
 # 
-# T2 SDE: architecture/x86-64/pkg_gcc_post.conf
+# Filename: architecture/x86-64/pkg_gcc_post.conf
+# Copyright (C) 2007 The OpenSDE Project
 # Copyright (C) 2004 - 2006 The T2 SDE Project
 # 
 # More information can be found in the files COPYING and README.
@@ -10,7 +11,7 @@
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation; version 2 of the License. A copy of the
 # GNU General Public License can be found in the file COPYING.
-# --- T2-COPYRIGHT-NOTE-END ---
+# --- SDE-COPYRIGHT-NOTE-END ---
 emulation_arch="`echo $arch_target | sed -e 's/[-_]*64//' -e 's/x86/i386/'`"
 
 gcc_amd64_postmake() {
@@ -28,10 +29,10 @@ gcc_amd64_postmake() {
 }
 
 if [ "$SDECFG_MULTILIB" = 1 ]; then
-	var_append patchfiles ' ' "$confdir/$pkg-$ver*multilib*.diff"
+	var_append patchfiles ' ' "$confdir/*multilib*.diff"
 	
 	hook_add postmake 5 "gcc_amd64_postmake"
 else
-	var_append patchfiles ' ' "$confdir/$pkg-$ver*pure64*.diff"
+	var_append patchfiles ' ' "$confdir/*pure64*.diff"
 fi
 
diff --git a/architecture/x86-64/pkg_glibc_post.conf b/architecture/x86-64/pkg_glibc_post.conf
index cc18904..7bca3d6 100644
--- a/architecture/x86-64/pkg_glibc_post.conf
+++ b/architecture/x86-64/pkg_glibc_post.conf
@@ -1,3 +1,17 @@
+# --- SDE-COPYRIGHT-NOTE-BEGIN ---
+# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
+# 
+# Filename: architecture/x86-64/pkg_glibc_post.conf
+# Copyright (C) 2007 The OpenSDE Project
+# 
+# More information can be found in the files COPYING and README.
+# 
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 2 of the License. A copy of the
+# GNU General Public License can be found in the file COPYING.
+# --- SDE-COPYRIGHT-NOTE-END ---
+
 pkg_glibc32_preconf(){
 	if [ $buildloop -eq 1 ]; then
 		# after finishing buildloop 1 we have to get back to the
@@ -31,9 +45,9 @@ EOT
 }
 
 if [ "$SDECFG_MULTILIB" != 1 ]; then
-	var_append patchfiles ' ' "$confdir/$pkg-$ver*pure64*.diff"
+	var_append patchfiles ' ' "$confdir/*pure64*.diff"
 else
-	var_append patchfiles ' ' "$confdir/$pkg-$ver*multilib*.diff"
+	var_append patchfiles ' ' "$confdir/*multilib*.diff"
 
 	if ! atstage toolchain; then
 		buildloops=2