--- admin/PlamoBuild.template.common.without_comment 2016-06-15 20:51:13.000000000 +0900 +++ plamo/01_minimum/old/open_iscsi-20161006/PlamoBuild.open_iscsi-2.0.873 2016-10-06 11:28:10.000000000 +0900 @@ -1,15 +1,15 @@ #!/bin/sh ###################################################################### -url="" -pkgbase= -vers= +url="http://fossies.org/linux/misc/open-iscsi-2.0-873.tar.gz" +pkgbase=open_iscsi +vers=2.0_873 arch=`uname -m` -build=P1 -src=$pkgbase-$vers +build=P5 +src=open-iscsi-2.0-873 patchfiles="" OPT_CONFIG="" -DOCS="README" +DOCS="COPYING Changelog README THANKS TODO" ###################################################################### fscheck() { @@ -233,6 +233,29 @@ esac done done + cd $B + cp -p Makefile Makefile.orig + cat <<- "EOF" | patch Makefile + 118c118 + < if [ ! -f /etc/iscsi/iscsid.conf ]; then \ + --- + > if true || [ ! -f /etc/iscsi/iscsid.conf ]; then \ + 131c131 + < if [ ! -f /etc/iscsi/initiatorname.iscsi ]; then \ + --- + > if true || [ ! -f /etc/iscsi/initiatorname.iscsi ]; then \ + EOF + cp -p usr/Makefile{,.orig} + cat <<- "EOF" | patch usr/Makefile + 57c57 + < $(CC) $(CFLAGS) $^ -o $@ -L../utils/open-isns -lisns + --- + > $(CC) $(CFLAGS) $^ -o $@ -L../utils/open-isns -lisns -lslp + 60c60 + < $(CC) $(CFLAGS) $^ -o $@ -L../utils/open-isns -lisns + --- + > $(CC) $(CFLAGS) $^ -o $@ -L../utils/open-isns -lisns -lslp + EOF for i in `seq 0 $((${#B[@]} - 1))` ; do cd ${B[$i]} if [ -f Makefile ] ; then @@ -272,6 +295,52 @@ make install DESTDIR=$P fi done + sed -i 's/:.*/:000000000000/' $P/etc/iscsi/initiatorname.iscsi + for i in iscsid.conf initiatorname.iscsi ; do + mv $P/etc/iscsi/$i $C/$i.new + done + mv $P/etc/iscsi/ifaces $C + for i in iscsid.conf initiatorname.iscsi ; do + mv $C/$i.new $P/etc/iscsi + done + mv $C/ifaces $P/etc/iscsi + install -d $P/etc/rc.d/init.d + cat <<- "EOF" > $P/etc/rc.d/init.d/open-iscsi + #!/bin/sh + + start() + { + iscsid + iscsiadm -m node -L automatic + } + + stop() + { + sync + iscsiadm -m node -U all + iscsiadm -k 0 + modprobe -r iscsi_tcp ib_iser 2> /dev/null + } + + case "$1" in + start) + start + ;; + stop) + stop + ;; + restart) + stop + start + ;; + *) + echo $"Usage: $0 {start|stop|restart}" + exit 1 + ;; + esac + exit 0 + EOF + chmod 755 $P/etc/rc.d/init.d/open-iscsi touch $W/i.et cd $W find $P ! -type l -newer i.st ! -newer i.et \ @@ -295,9 +364,31 @@ ( cd $docdir ; find ${src[$i]} -type d -exec touch -r $W/{} {} \; ) done convert - tar cvpf $pkg.tar -C $P `cd $P ; find usr/bin | tail -n+2` - tar rvpf $pkg.tar -C $P `cd $P ; find usr/share/man/man1 | tail -n+2` + install -d $P/install + cat <<- "EOF" > $P/install/doinst.sh + mv etc/iscsi/iscsid.conf.new /tmp + if [ -f etc/iscsi/iscsid.conf ] ; then + mv /tmp/iscsid.conf.new etc/iscsi/iscsid.conf.dist + else + mv /tmp/iscsid.conf.new etc/iscsi/iscsid.conf + fi + EOF + cat <<- EOF >> $P/install/doinst.sh + #%% begin initialize $pkg + # generate iSCSI initiator IQN + rm /etc/iscsi/initiatorname.iscsi.new + if [ ! -f /etc/iscsi/initiatorname.iscsi ] ; then + echo "InitiatorName=\`iscsi-iname\`" > /etc/iscsi/initiatorname.iscsi + fi + #%% end + EOF + touch -t `date '+%m%d0900'` $P/install/doinst.sh + tar cvpf $pkg.tar -C $P `cd $P ; find sbin | tail -n+2` + tar rvpf $pkg.tar -C $P etc/iscsi + tar rvpf $pkg.tar -C $P etc/rc.d/init.d/open-iscsi + tar rvpf $pkg.tar -C $P `cd $P ; find usr/share/man/man8 | tail -n+2` tar rvpf $pkg.tar -C $P usr/share/doc/$src + tar rvpf $pkg.tar -C $P install/doinst.sh touch -t `date '+%m%d0900'` $pkg.tar ; xz $pkg.tar ; touch $pkg.tar.xz mv $pkg.tar.xz $pkg.txz read -p "Do you want to keep work files? [y/N] " ans