Просмотр исходного кода

more platform support; less bullshit files in .src.sh

Ralf S. Engelschall 24 лет назад
Родитель
Сommit
6f39c21d3b
3 измененных файлов с 36 добавлено и 9 удалено
  1. 14 5
      openpkg/openpkg.boot
  2. 2 2
      openpkg/openpkg.spec
  3. 20 2
      openpkg/rpmrc

+ 14 - 5
openpkg/openpkg.boot

@@ -109,7 +109,7 @@ if [ ".$bs" = .1 ]; then
     else
        dstdir=.
     fi
-    tmpdir="/tmp/$me.$$"
+    tmpdir="/tmp/$me.$$.d"
     if [ -d ../PKG/SRC ]; then
        pkgdir=../PKG/SRC
     elif [ -d ../PKG ]; then
@@ -129,13 +129,22 @@ if [ ".$bs" = .1 ]; then
     echo "   $pkgdir/$name-$version-$release.src.sh"
     rm -rf $tmpdir
     mkdir $tmpdir
-    (cd $dstdir && tar cf - *) | (cd $tmpdir && tar xf -)
-    (cd $srcdir && tar cf - *) | (cd $tmpdir && tar xf -)
+    ( echo "dstdir=$dstdir"
+      echo "srcdir=$srcdir"
+      echo "tmpdir=$tmpdir"
+      grep '^%define' $spec | sed -e 's:^%define *\([^ ]*\) *\(.*\):\1="\2":'
+      grep '^Source' $spec  | sed -e 's;^Source[0-9]*: *;;' -e 's;^.*/;$dstdir/;' \
+                                  -e 's;^\([^/]*\)$;$srcdir/\1;' -e 's;%;$;g' \
+                                  -e 's;^\(.*\)$;cp \1 $tmpdir/;'
+      echo "cp -p $spec $tmpdir/"
+    ) >$tmpdir/.sh
+    sh $tmpdir/.sh
+    rm -f $tmpdir/.sh
     sed <$srcdir/aux.wrapsrc.sh >$pkgdir/$name-$version-$release.src.sh \
         -e "s;@DIR@;$name-$version-$release.src;" -e "s;@TGZ@;$name-$version-$release.src.tar.Z;"
     (cd $tmpdir && tar cf - *) | compress |\
-    uuencode $name-$version-$release.src.tar.Z \
-        | dd bs=64000 2>/dev/null >>$pkgdir/$name-$version-$release.src.sh
+    uuencode $name-$version-$release.src.tar.Z |\
+        dd bs=64000 2>/dev/null >>$pkgdir/$name-$version-$release.src.sh
     exit 0
 fi
 

+ 2 - 2
openpkg/openpkg.spec

@@ -39,8 +39,8 @@
 #   o any cc(1)
 
 #   the package version and release
-%define       V_openpkg 20020616
-%define       R_openpkg 20020616
+%define       V_openpkg 20020620
+%define       R_openpkg 20020620
 
 #   the used software versions
 %define       V_rpm     4.0.2

+ 20 - 2
openpkg/rpmrc

@@ -109,14 +109,26 @@ arch_compat:        9000/778:   hppa    noarch
 
 #   Linux
 buildostranslate:   Linux2.0:   linux2.0
+buildostranslate:   Linux2.1:   linux2.1
 buildostranslate:   Linux2.2:   linux2.2
+buildostranslate:   Linux2.3:   linux2.3
 buildostranslate:   Linux2.4:   linux2.4
+buildostranslate:   Linux2.5:   linux2.5
+buildostranslate:   Linux2.6:   linux2.6
 os_canon:           linux2.0:   linux2.0 1
+os_canon:           linux2.1:   linux2.1 1
 os_canon:           linux2.2:   linux2.2 1
+os_canon:           linux2.3:   linux2.3 1
 os_canon:           linux2.4:   linux2.4 1
+os_canon:           linux2.5:   linux2.5 1
+os_canon:           linux2.6:   linux2.6 1
 os_compat:          Linux2.0:   linux2.0
-os_compat:          Linux2.2:   linux2.2 linux2.0 
-os_compat:          Linux2.4:   linux2.4 linux2.2 linux2.0 
+os_compat:          Linux2.1:   linux2.1 linux2.0
+os_compat:          Linux2.2:   linux2.2 linux2.1 linux2.0 
+os_compat:          Linux2.3:   linux2.3 linux2.2 linux2.1 linux2.0 
+os_compat:          Linux2.4:   linux2.4 linux2.3 linux2.2 linux2.1 linux2.0 
+os_compat:          Linux2.5:   linux2.5 linux2.4 linux2.3 linux2.2 linux2.1 linux2.0 
+os_compat:          Linux2.6:   linux2.6 linux2.5 linux2.4 linux2.3 linux2.2 linux2.1 linux2.0 
 
 #   Solaris
 buildostranslate:   SunOS5.0:   solaris2.0
@@ -158,6 +170,8 @@ buildostranslate:   FreeBSD4.3: freebsd4.3
 buildostranslate:   FreeBSD4.4: freebsd4.4
 buildostranslate:   FreeBSD4.5: freebsd4.5
 buildostranslate:   FreeBSD4.6: freebsd4.6
+buildostranslate:   FreeBSD4.7: freebsd4.7
+buildostranslate:   FreeBSD4.8: freebsd4.8
 buildostranslate:   FreeBSD5.0: freebsd5.0
 os_canon:           freebsd4.0: freebsd4.0 8
 os_canon:           freebsd4.1: freebsd4.1 8
@@ -166,6 +180,8 @@ os_canon:           freebsd4.3: freebsd4.3 8
 os_canon:           freebsd4.4: freebsd4.4 8
 os_canon:           freebsd4.5: freebsd4.5 8
 os_canon:           freebsd4.6: freebsd4.6 8
+os_canon:           freebsd4.7: freebsd4.7 8
+os_canon:           freebsd4.8: freebsd4.8 8
 os_compat:          FreeBSD4.0: freebsd4.0 linux2.0 linux2.2
 os_compat:          FreeBSD4.1: freebsd4.1 freebsd4.0 linux2.0 linux2.2
 os_compat:          FreeBSD4.2: freebsd4.2 freebsd4.1 freebsd4.0 linux2.0 linux2.2
@@ -173,6 +189,8 @@ os_compat:          FreeBSD4.3: freebsd4.3 freebsd4.2 freebsd4.1 freebsd4.0 linu
 os_compat:          FreeBSD4.4: freebsd4.4 freebsd4.3 freebsd4.2 freebsd4.1 freebsd4.0 linux2.0 linux2.2
 os_compat:          FreeBSD4.5: freebsd4.5 freebsd4.4 freebsd4.3 freebsd4.2 freebsd4.1 freebsd4.0 linux2.0 linux2.2
 os_compat:          FreeBSD4.6: freebsd4.6 freebsd4.5 freebsd4.4 freebsd4.3 freebsd4.2 freebsd4.1 freebsd4.0 linux2.0 linux2.2
+os_compat:          FreeBSD4.7: freebsd4.7 freebsd4.6 freebsd4.5 freebsd4.4 freebsd4.3 freebsd4.2 freebsd4.1 freebsd4.0 linux2.0 linux2.2
+os_compat:          FreeBSD4.8: freebsd4.8 freebsd4.7 freebsd4.6 freebsd4.5 freebsd4.4 freebsd4.3 freebsd4.2 freebsd4.1 freebsd4.0 linux2.0 linux2.2
 os_compat:          FreeBSD5.0: freebsd5.0 freebsd4.6 freebsd4.5 freebsd4.4 freebsd4.3 freebsd4.2 freebsd4.1 freebsd4.0 linux2.0 linux2.2
 
 #   Tru64