sync with local update

ebijun · Nov 5, 2017 · 3632318 · 3632318
1 parent 873cbf0
commit 3632318
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 11 deletions.
diff --git a/allwinner/Image/Makefile b/allwinner/Image/Makefile
@@ -3,11 +3,11 @@
 ARCH=earmv7hf
 #ARCH=earm
 
-PKG_PATH=ftp://ftp.netbsd.org/pub/NetBSD/misc/jun/allwinner/${ARCH}/2016-05-14
+PKG_PATH=ftp://ftp.netbsd.org/pub/NetBSD/misc/jun/allwinner/${ARCH}/2016-11-19
 #;ftp://ftp.netbsd.org/pub/pkgsrc/packages/NetBSD/earmv7hf/7.0/All
 
 # iso file information
-IMAGE=/usr/release/images/NetBSD-7.99.30-evbarm-${ARCH}-201606081850Z.iso
+IMAGE=/usr/release/images/NetBSD-7.99.42-evbarm-${ARCH}-201611121350Z.iso
 
 # set image file name
 FILE=`date +%Y-%m-%d`-netbsd-cubieboard2-${ARCH}.img

diff --git a/allwinner/Image/Makefile.bpi b/allwinner/Image/Makefile.bpi
@@ -6,16 +6,16 @@
 ARCH=earm
 GZIMG=rpi.img
 
-PKG_PATH=ftp://ftp.netbsd.org/pub/NetBSD/misc/jun/allwinner/${ARCH}/2016-05-14
+PKG_PATH=ftp://ftp.netbsd.org/pub/NetBSD/misc/jun/allwinner/${ARCH}/2016-06-18
 
 # set image file name
 #FILE=`date +%Y-%m-%d`-netbsd-bpi.img
 FILE=`date +%Y-%m-%d`-netbsd-bpi-${ARCH}.img
 
 # iso file information
-IMAGE=/usr/release/images/NetBSD-7.99.26-evbarm-${ARCH}-201603281740Z.iso
+IMAGE=/usr/release/images/NetBSD-7.99.30-evbarm-${ARCH}-201606132020Z.iso
 
-PKGSRC=../../pkgsrc/pkgsrc-2015Q4.tar.gz
+PKGSRC=../../pkgsrc/pkgsrc-2016Q1.tar.gz
 
 # UBOOT
 BOARD=bananapi

diff --git a/allwinner/Image/NewestISO b/allwinner/Image/NewestISO
@@ -4,6 +4,7 @@
 require 'net/ftp'
 
 FTP="nyftp.netbsd.org"
+CDN="nycdn.netbsd.org"
 #FTP="ftp.jp.netbsd.org"
 #FTP="ftp7.jp.netbsd.org"
 
@@ -77,7 +78,7 @@ ftp = Net::FTP.open(FTP) do |ftp|
 			next
 		end
 	end
-	puts "ftp ftp://"+FTP+isofile.path
+	puts "ftp http://"+CDN+isofile.path
 	puts "mv "+isofile.body+".iso "+IMAGES+isofile.body+"-"+isofile.date+".iso"
 
 	ftp.quit

diff --git a/allwinner/Image/etc/mk.conf b/allwinner/Image/etc/mk.conf
@@ -24,7 +24,7 @@ UPDATE_TARGET=package
 
 # set default python version: /usr/pkgsrc/lang/ruby/rubyversion.mk
 #  Possible values: 18 200 21 22 23
-RUBY_VERSION_DEFAULT=22
+#RUBY_VERSION_DEFAULT=22
 
 # from /usr/pkgsrc/mk/defaults/mk.conf
 

diff --git a/hpcarm/Image/Makefile b/hpcarm/Image/Makefile
@@ -4,7 +4,7 @@
 FILE=`date +%Y-%m-%d`-netbsd-hpcarm.img
 
 # iso file information
-IMAGE=/usr/release/images/NetBSD-7.99.30-hpcarm-201605300010Z.iso
+IMAGE=/usr/release/images/NetBSD-7.99.33-hpcarm-201607080210Z.iso
 
 PKGSRC=../../pkgsrc/pkgsrc-2015Q3.tar.gz
 

diff --git a/sunxi/DD b/sunxi/DD
@@ -1,6 +1,7 @@
+BOARD=bananapi
 #BOARD=orangepi-plus2e
 #BOARD=orangepi-2
-BOARD=orangepi-one
+#BOARD=orangepi-one
 #BOARD=nanopi-neo
 
 #fdtfile sun8i-h3-nanopi-neo.dtb

diff --git a/sunxi/u-boot/orangepi_one/u-boot-sunxi-with-spl.bin b/sunxi/u-boot/orangepi_one/u-boot-sunxi-with-spl.bin
diff --git a/zaurus/Image/Makefile b/zaurus/Image/Makefile
@@ -4,7 +4,7 @@
 FILE=`date +%Y-%m-%d`-netbsd-zaurus.img
 
 # iso file information
-IMAGE=/usr/release/images/NetBSD-7.99.13-zaurus-201504292340Z.iso
+IMAGE=/usr/release/images/NetBSD-7.99.34-zaurus-201607220120Z.iso
 PKGSRC=../../pkgsrc/pkgsrc-2015-05-23.tar.gz
 
 SETS=/mnt1/zaurus/binary/sets
@@ -57,7 +57,7 @@ extract:
 	mount /dev/${VND}a ${MNT}
 	for i in ${LIST} ; do (tar xzpf ${SETS}/$${i}.tgz -C ${MNT};); done
 	(cd ${MNT}/dev;./MAKEDEV all)
-	tar xzpf ${PKGSRC} -C ${MNT}/usr
+#	tar xzpf ${PKGSRC} -C ${MNT}/usr
 	mkdir ${MNT}/msdos
 	mkdir ${MNT}/kern
 	mkdir ${MNT}/proc