diff --git a/ayarlar/dokunulmaz b/ayarlar/dokunulmaz index cda64b6a7..7fde4bb28 100644 --- a/ayarlar/dokunulmaz +++ b/ayarlar/dokunulmaz @@ -86,6 +86,7 @@ usr/share/locale/ usr/share/locale/tr/ usr/share/locale/tr/LC_MESSAGES/ usr/share/man/ +usr/share/aclocal/ usr/share/info/ usr/share/man/man1/ usr/share/man/man5/ diff --git a/bin/mps b/bin/mps index 18bd0e70b..fb9694119 100755 --- a/bin/mps +++ b/bin/mps @@ -13,7 +13,7 @@ icerik_ekle(){ paketad=`echo "$1" | cut -d'#' -f1` paketad=`basename $paketad` echo $paketad" paketi kuruluyor." - tar -C /tmp --extract --file=$1 .PRE > /tmp/$paketad_pre.log + tar -C /tmp --extract --file=$1 .PRE 1 2> /tmp/$paketad_pre.log #kos-kur kontrolu if [ -f /tmp/.PRE ];then bash /tmp/.PRE @@ -71,9 +71,9 @@ paket_sil(){ if [ "$sil_onay" = "e" ];then xargs rm -r -f < /tmp/$paket.sil && rm -r -f /var/lib/pkg/DB/"$paket" && - rm -f /tmp/$paket.sil echo $paket" paketi silindi." fi + rm -f /tmp/$paket.sil else echo "paket zaten kurulu değil!" fi @@ -113,16 +113,18 @@ derleme_listyap(){ then # echo "pas" #else - echo "derleme.liste yazılıyor:" "$1" + ana="`find $talimatname_dizin -name $1`" + echo ${ana#"$talimatname_dizin"} + #sadece genel bagimliliklar derlenecek echo "$1" >> derleme.liste + if [ -d "$talimatname_dizin/genel/$1" ];then + echo "$1" >> genel.derleme.liste + fi fi } paket_derle_oto(){ - rm derleme.liste - touch derleme.liste - derleme_listyap "$1" - for dpkt in `cat derleme.liste`;do + for dpkt in `cat $1`;do echo $dpkt "derleniyor...." paket_derle $dpkt done @@ -152,7 +154,13 @@ paket_derle(){ if [ "$derleme_onay" = "e" ];then echo "$1" "derleniyor...." #mpsd -d > /dev/null - mpsd -d + #mpsd -d + echo "------------------------" + mpsd -d 2>&1|tee /tmp/"$1".log + if ( grep "^=======>" /tmp/"$1".log| tail -1 |grep "ERROR" > /dev/null);then + echo "derleme sisteminde hata oluştu -----> " /tmp/"$1".log + exit 1 + fi if [ "$kurulum_onay" = "evet" ];then for kpkt in `ls $1* | cut -d'#' -f1`;do mps -k "$kpkt#"* @@ -247,8 +255,14 @@ ayarlar() { -odk|--pkodk) paket_derle_oto "$2" ;; -dly|--drly) - rm derleme.liste + if [ -f derleme.liste ];then + mv derleme.liste derleme.liste.eski + fi + if [ -f genel.derleme.liste ];then + mv genel.derleme.liste genel.derleme.liste.eski + fi touch derleme.liste + touch genel.derleme.liste derleme_listyap "$2" ;; -b|--pkbl) paket_bilgi "$2" ;; @@ -320,6 +334,7 @@ if [ "$ikaynak" = "ag" ]; then fi if [ "$ikaynak" = "yerel" ]; then + local silme pkontrol=`basename $2 | grep -w "mps.lz"` if [ ! -z "$pkontrol" -a "$pkontrol" != "" ]; then paketad=`echo "$2" | cut -d'#' -f1` @@ -327,7 +342,18 @@ if [ "$ikaynak" = "yerel" ]; then if [ "$kkont" = "degil" ];then icerik_ekle "$2" else - echo "$2 paketi zaten kurulu" + while true; do + read -p "$2 paketi zaten kurulu silinip kurulsun mu?" eh + case $eh in + [Ee]* ) silme="e"; break;; + [Hh]* ) break;; + * ) echo "e veya h";; + esac + done + if [ "$silme" = "e" ];then + paket_sil "$paketad" + icerik_ekle "$2" + fi fi else echo "yerelde mps paketi bulunamadı." diff --git a/bin/tamir_libffi64 b/bin/tamir_libffi64 new file mode 100755 index 000000000..a90348e05 --- /dev/null +++ b/bin/tamir_libffi64 @@ -0,0 +1,2 @@ +ln -s /usr/lib/libffi.la /usr/lib64/ +ln -s /usr/lib/libffi.so /usr/lib64/ \ No newline at end of file diff --git a/bin/tamir_xterm b/bin/tamir_xterm new file mode 100755 index 000000000..7d0e0434f --- /dev/null +++ b/bin/tamir_xterm @@ -0,0 +1 @@ +cp /lib/ncurses/terminfo/x/xterm /usr/share/terminfo/x/ diff --git a/lfs-mekanizma b/lfs-mekanizma index 9d47491d3..0d629655a 100755 --- a/lfs-mekanizma +++ b/lfs-mekanizma @@ -1011,7 +1011,7 @@ chroot_gir(){ lfs_kontrol unmount_islemi mount_islemi - chroot "$LFS" /usr/bin/env -i HOME=/root TERM="$TERM" PS1='\u:\w\$ ' /bin/bash --login +h + chroot "$LFS" /usr/bin/env -i HOME=/root TERM="$TERM" PS1='\u:\w\$ ' /bin/bash --login +h } diff --git a/mps-0.1/dokunulmaz b/mps-0.1/dokunulmaz index cda64b6a7..7fde4bb28 100644 --- a/mps-0.1/dokunulmaz +++ b/mps-0.1/dokunulmaz @@ -86,6 +86,7 @@ usr/share/locale/ usr/share/locale/tr/ usr/share/locale/tr/LC_MESSAGES/ usr/share/man/ +usr/share/aclocal/ usr/share/info/ usr/share/man/man1/ usr/share/man/man5/ diff --git a/mps-0.1/mps b/mps-0.1/mps index 5d37aa1db..fb9694119 100755 --- a/mps-0.1/mps +++ b/mps-0.1/mps @@ -113,16 +113,18 @@ derleme_listyap(){ then # echo "pas" #else - echo "derleme.liste yazılıyor:" "$1" + ana="`find $talimatname_dizin -name $1`" + echo ${ana#"$talimatname_dizin"} + #sadece genel bagimliliklar derlenecek echo "$1" >> derleme.liste + if [ -d "$talimatname_dizin/genel/$1" ];then + echo "$1" >> genel.derleme.liste + fi fi } paket_derle_oto(){ - rm derleme.liste - touch derleme.liste - derleme_listyap "$1" - for dpkt in `cat derleme.liste`;do + for dpkt in `cat $1`;do echo $dpkt "derleniyor...." paket_derle $dpkt done @@ -152,7 +154,13 @@ paket_derle(){ if [ "$derleme_onay" = "e" ];then echo "$1" "derleniyor...." #mpsd -d > /dev/null - mpsd -d + #mpsd -d + echo "------------------------" + mpsd -d 2>&1|tee /tmp/"$1".log + if ( grep "^=======>" /tmp/"$1".log| tail -1 |grep "ERROR" > /dev/null);then + echo "derleme sisteminde hata oluştu -----> " /tmp/"$1".log + exit 1 + fi if [ "$kurulum_onay" = "evet" ];then for kpkt in `ls $1* | cut -d'#' -f1`;do mps -k "$kpkt#"* @@ -247,8 +255,14 @@ ayarlar() { -odk|--pkodk) paket_derle_oto "$2" ;; -dly|--drly) - rm derleme.liste + if [ -f derleme.liste ];then + mv derleme.liste derleme.liste.eski + fi + if [ -f genel.derleme.liste ];then + mv genel.derleme.liste genel.derleme.liste.eski + fi touch derleme.liste + touch genel.derleme.liste derleme_listyap "$2" ;; -b|--pkbl) paket_bilgi "$2" ;; @@ -320,6 +334,7 @@ if [ "$ikaynak" = "ag" ]; then fi if [ "$ikaynak" = "yerel" ]; then + local silme pkontrol=`basename $2 | grep -w "mps.lz"` if [ ! -z "$pkontrol" -a "$pkontrol" != "" ]; then paketad=`echo "$2" | cut -d'#' -f1` @@ -327,7 +342,18 @@ if [ "$ikaynak" = "yerel" ]; then if [ "$kkont" = "degil" ];then icerik_ekle "$2" else - echo "$2 paketi zaten kurulu" + while true; do + read -p "$2 paketi zaten kurulu silinip kurulsun mu?" eh + case $eh in + [Ee]* ) silme="e"; break;; + [Hh]* ) break;; + * ) echo "e veya h";; + esac + done + if [ "$silme" = "e" ];then + paket_sil "$paketad" + icerik_ekle "$2" + fi fi else echo "yerelde mps paketi bulunamadı." diff --git a/qemu.sh b/qemu.sh new file mode 100755 index 000000000..7d64e6c60 --- /dev/null +++ b/qemu.sh @@ -0,0 +1 @@ +qemu-system-x86_64 -m 1024 malfs.iso