--- plamo/99_test/old/installer-20170825/PlamoBuild.installer-6.2 2017-08-25 10:33:25.000000000 +0900 +++ plamo/99_test/installer/PlamoBuild.installer-6.2 2019-06-16 15:59:07.000000000 +0900 @@ -24,7 +24,7 @@ ftp://plamo.linet.gr.jp/pub/Plamo-src/plamo/00_base/ncurses/ncurses-6.0-Charable.patch.gz http://www.kernel.org/pub/linux/utils/util-linux/v2.28/util-linux-2.28.tar.xz http://downloads.sourceforge.net/e2fsprogs/e2fsprogs-1.43.3.tar.gz - https://www.kernel.org/pub/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v4.8.3.tar.gz + https://www.kernel.org/pub/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v4.12.1.tar.gz http://mirror.opencompute.org/onie/dosfstools-3.0.26.tar.xz https://tuxera.com/opensource/ntfs-3g_ntfsprogs-2016.2.22.tgz https://github.com/PhantomX/slackbuilds/raw/master/ntfs-3g/patches/ntfs-3g_ntfsprogs-2011.10.9-RC-ntfsck-unsupported-return-0.patch @@ -56,7 +56,7 @@ src[10]=ncurses-6.0 src[11]=util-linux-2.28 src[12]=e2fsprogs-1.43.3 -src[13]=btrfs-progs-v4.8.3 +src[13]=btrfs-progs-v4.12.1 src[14]=dosfstools-3.0.26 src[15]=ntfs-3g_ntfsprogs-2016.2.22 src[16]=mdadm-3.2.3 @@ -101,7 +101,7 @@ OPT_CONFIG[17]="--enable-static_link --enable-applib --enable-cmdlib --enable-pkgconfig --enable-dmeventd --with-thin=internal" DOCS="" -template=20170713 +template=20180815 tmplurl=ftp://plamo.linet.gr.jp/pub/Plamo-src/admin ###################################################################### @@ -267,14 +267,15 @@ touch $mandir/man[58]/* touch $W/i.et cd $W - find $P -newer i.st ! -newer i.et -exec touch -ht `date '+%m%d0900'` {} \; + TZ=UTC find $P -newer i.st ! -newer i.et \ + -exec touch -ht `date -u '+%m%d0000'` {} \; compress - find $mandir -type l -exec touch -ht `date '+%m%d0900'` {} \; + TZ=UTC find $mandir -type l -exec touch -ht `date -u '+%m%d0000'` {} \; strip_bindir $P/libexec strip_bindir $P/lib/udev strip_libdir $P/$libdir/device-mapper gzip_dir $mandir/de/man8 - touch -t `date '+%m%d0900'` $P/{bin,sbin,libexec,lib/udev} \ + TZ=UTC touch -t `date -u '+%m%d0000'` $P/{bin,sbin,libexec,lib/udev} \ $P/$libdir/device-mapper $infodir $mandir/{man[134578],de/man8} tar xvpzf installer-plamoinitrd.targz -C $P case $arch in i686) a=x86 ;; armv7l) a=arm ;; *) a=$arch ;; esac @@ -328,7 +329,7 @@ initrd (hd1)/isolinux/initrd.gz } EOF - find $media/EFI -exec touch -t `date '+%m%d0900'` {} \; + TZ=UTC find $media/EFI -exec touch -t `date -u '+%m%d0000'` {} \; mkdir efiboot fallocate -l 1440K $K/efiboot.img /sbin/mkfs -t vfat $K/efiboot.img @@ -341,12 +342,12 @@ initrd (cd0)/isolinux/initrd.gz } EOF - find efiboot/EFI -exec touch -t `date '+%m%d0900'` {} \; + TZ=UTC find efiboot/EFI -exec touch -t `date -u '+%m%d0000'` {} \; umount efiboot - touch -t `date '+%m%d0900'` $K/efiboot.img + TZ=UTC touch -t `date -u '+%m%d0000'` $K/efiboot.img else img=plamo-${vers}_${a}_`date '+%y%m%d'`_sd.img - size=896 ; fallocate -l ${size}M $img + size=1920 ; fallocate -l ${size}M $img cat <<- EOF | sfdisk $img 8192,$(((size - 4) * 2048)),c,* EOF @@ -360,7 +361,7 @@ tar xvpJf kernel-*.txz -C $P ln -sfn /mnt/boot $P/boot touch -hr $P/{cdrom,boot} - touch -t `date '+%m%d0900'` $P/lib{,/modules} + TZ=UTC touch -t `date -u '+%m%d0000'` $P/lib{,/modules} rm -rf $P/{usr,install} if [ $media == DVD ] ; then ln -f $K/config{-*,} @@ -368,23 +369,25 @@ ln -f $K/System.map{-*,} fi ( cd $P ; find . | tail -n+2 | cpio -o -H newc | gzip -n ) > $K/initrd.gz - touch -t `date '+%m%d0900'` $K{,/initrd.gz} + TZ=UTC touch -t `date -u '+%m%d0000'` $K{,/initrd.gz} for i in plamo contrib Change.Log{,-2011} \ README.{1ST,EUC,SJIS,GPT} README_GPT.pdf allpkgs.pickle ; do if [ $media == DVD ] ; then ln -s /mnt/work/Plamo-6.x/$a/$i $media else - cp -R --preserve=timestamps /mnt/work/Plamo-6.x/$a/$i $media + ( cd /mnt/work/Plamo-6.x/$a + tar cpf - --exclude texlive_texmf_doc*.txz $i ) \ + | ( cd $media ; tar xpof - ) fi done src=$media ; setup_docdir - touch -t `date '+%m%d0900'` $media + TZ=UTC touch -t `date -u '+%m%d0000'` $media false && convert_links if [ $media == DVD ] ; then mkisofs -v -f -J -r -b isolinux/isolinux.bin -c isolinux/boot.cat \ -no-emul-boot -boot-load-size 4 -boot-info-table -eltorito-alt-boot \ -eltorito-platform efi -eltorito-boot isolinux/efiboot.img \ - -m old -m texlive_texmf[34]-*.txz \ + -m old -m texlive_texmf_doc*.txz \ -V plamo-$vers-$a -o plamo-${vers}_${a}_`date '+%y%m%d'`_dvd.iso $media else umount $media