From 0cbd42aa464b350f08b08b8c558032e0c93c6eda Mon Sep 17 00:00:00 2001
From: Stefan Fiedler <stefan.fiedler@students.jku.at>
Date: Fri, 2 Nov 2007 13:22:02 +0000
Subject: [PATCH] Stefan Fiedler: 	00-dirtree: create lib64 dirs for
 multilib builds

[2007091023133230802] (https://www.rocklinux.net/submaster)



git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@8719 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc
---
 package/base/00-dirtree/00-dirtree.conf | 12 +++++++++---
 package/base/00-dirtree/data.txt        |  5 -----
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/package/base/00-dirtree/00-dirtree.conf b/package/base/00-dirtree/00-dirtree.conf
index 18473bb81..3f8b427f9 100644
--- a/package/base/00-dirtree/00-dirtree.conf
+++ b/package/base/00-dirtree/00-dirtree.conf
@@ -1,3 +1,4 @@
+#!/bin/bash
 # --- ROCK-COPYRIGHT-NOTE-BEGIN ---
 # 
 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
@@ -24,7 +25,14 @@
 main_dt() {
 	echo -n "Change to root directory ... "
 	mkdir -p $xroot/ ; cd $xroot/ ; echo 'done'
-	
+
+	mkdir -p "$xroot"/{,usr/,usr/local/}lib
+	if [ "$ROCKCFG_MULTILIB" = 1 ] ; then
+		if [ "$arch_target64" ] ; then
+			mkdir -p "$xroot"/{,usr/,usr/local/}lib64
+		fi
+	fi
+
 	while read a b c d e ; do
 	    if [ "$a" = "chmod" -o "$a" = "chown" ] ; then
 		echo "Running $a ($b) on $c ..."
@@ -38,8 +46,6 @@ main_dt() {
 		elif [ "$a" = "l" -o "$a" = "l$(( arch_sizeof_char_p * 8 ))" ] ; then
 			echo "Create symlink $b ($c) ..."
 			ln -fsn "$c" "$xroot/$b"
-		elif [ "$a" = "l64" ] ; then
-			true
 		elif [ "$a" = "mknod" ] ; then
 			echo "Create device node $b ..."
 			$a "$xroot/$b" $c $d $e
diff --git a/package/base/00-dirtree/data.txt b/package/base/00-dirtree/data.txt
index 8919b27dc..09266c806 100644
--- a/package/base/00-dirtree/data.txt
+++ b/package/base/00-dirtree/data.txt
@@ -43,7 +43,6 @@ m etc/profile.d
 m etc/stone.d
 m etc/skel
 m home
-m lib
 m lib/modules
 m media
 m mnt
@@ -58,7 +57,6 @@ m usr
 m usr/bin
 m usr/games
 m usr/include
-m usr/lib
 m usr/local
 m usr/local/bin
 m usr/local/etc
@@ -129,9 +127,6 @@ l usr/var ../var
 l var/spool/mail ../mail
 l var/state/pkgtool ../adm
 
-l64 lib64 lib
-l64 usr/lib64 lib
-
 chmod 0700 root
 chmod ugo=rwxt tmp
 chmod ugo=rwxt var/mail