--- plamo/00_base/old/grub-20160320/PlamoBuild.grub-2.02~beta2 2016-03-20 22:40:55.000000000 +0900 +++ plamo/00_base/grub/PlamoBuild.grub-2.02~beta2 2016-06-21 22:41:23.000000000 +0900 @@ -7,12 +7,16 @@ pkgbase=grub vers=2.02~beta2 arch=`uname -m` -build=P12 -src=$pkgbase-$vers -OPT_CONFIG="--sysconfdir=/etc --disable-grub-mount --disable-werror - --with-platform=efi" -DOCS="BUGS TODO THANKS COPYING ABOUT-NLS ChangeLog AUTHORS README +build=P13 +src[0]=$pkgbase-$vers +src[1]=${src[0]} +patchfiles[0]="" +patchfiles[1]="" +OPT_CONFIG[0]="--disable-grub-mount --disable-werror" +OPT_CONFIG[1]="${OPT_CONFIG[0]} --with-platform=efi" +DOCS[0]="BUGS TODO THANKS COPYING ABOUT-NLS ChangeLog AUTHORS README NEWS INSTALL" +DOCS[1]="" ###################################################################### fscheck() { @@ -189,14 +193,35 @@ fi if [ $opt_download -eq 1 ] ; then for i in $url ; do - if [ ! -f ${i##*/} ] ; then wget $i ; fi + if [ ! -f ${i##*/} ] ; then + wget $i ; j=${i%.*} + for sig in asc sig{,n} {sha{256,1},md5}{,sum} ; do + if wget --spider $i.$sig ; then wget $i.$sig ; break ; fi + if wget --spider $j.$sig ; then + case ${i##*.} in + gz) gunzip -c ${i##*/} > ${j##*/} ;; + bz2) bunzip2 -c ${i##*/} > ${j##*/} ;; + xz) unxz -c ${i##*/} > ${j##*/} ;; + esac + touch -r ${i##*/} ${j##*/} ; i=$j ; wget $i.$sig ; break + fi + done + if [ -f ${i##*/}.$sig ] ; then + case $sig in + asc|sig|sign) gpg2 --verify ${i##*/}.$sig ;; + sha256|sha1|md5) ${sig}sum -c ${i##*/}.$sig ;; + *) $sig -c ${i##*/}.$sig ;; + esac + if [ $? -ne 0 ] ; then echo "archive verify failed" ; exit ; fi + fi + fi done for i in $url ; do case ${i##*.} in tar) tar xvpf ${i##*/} ;; - gz) tar xvpzf ${i##*/} ;; - bz2) tar xvpjf ${i##*/} ;; - xz) tar xvpJf ${i##*/} ;; + gz|tgz) tar xvpzf ${i##*/} ;; + bz2|tbz) tar xvpjf ${i##*/} ;; + xz|txz) tar xvpJf ${i##*/} ;; esac done fi @@ -204,13 +229,26 @@ for i in `seq 0 $((${#B[@]} - 1))` ; do if [ -d ${B[$i]} ] ; then rm -rf ${B[$i]} ; fi ; cp -a ${S[$i]} ${B[$i]} done - cd $B - for i in `cat $W/debian/patches/series` ; do - if [ $i != dpkg_version_comparison.patch ] ; then - patch -Np1 -i $W/debian/patches/$i - fi + for i in `seq 0 $((${#B[@]} - 1))` ; do + cd ${B[$i]} + for j in ${patchfiles[$i]} ; do + case ${j##*.} in + gz) gunzip -c $W/$j | patch -Np1 -i - ;; + bz2) bunzip2 -c $W/j | patch -Np1 -i - ;; + xz) unxz -c $W/$j | patch -Np1 -i - ;; + *) patch -Np1 -i $W/$j ;; + esac + done + done + for i in `seq 0 $((${#B[@]} - 1))` ; do + cd ${B[$i]} + for j in `cat $W/debian/patches/series` ; do + if [ $j != dpkg_version_comparison.patch ] ; then + patch -Np1 -i $W/debian/patches/$j + fi + done + ./autogen.sh done - ./autogen.sh for i in `seq 0 $((${#B[@]} - 1))` ; do cd ${B[$i]} if [ -f Makefile ] ; then @@ -220,8 +258,8 @@ rm -rf config.cache config.log fi if [ -x configure ] ; then - ./configure --prefix=/usr --libdir='${exec_prefix}'/$libdir \ - --infodir='${prefix}'/share/info \ + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ + --libdir='${exec_prefix}'/$libdir --infodir='${prefix}'/share/info \ --mandir='${prefix}'/share/man ${OPT_CONFIG[$i]} fi done @@ -292,7 +330,7 @@ touch -t `date '+%m%d0900'` $docdir/$src/$myname gzip_one $docdir/$src/$myname else - ln $docdir/$src/$myname.gz $docdir/${src[$i]} + false && ln $docdir/$src/$myname.gz $docdir/${src[$i]} fi ( cd $docdir ; find ${src[$i]} -type d -exec touch -r $W/{} {} \; ) done