Fix Makefile to clean and remove .svn when making dist. rc-mount no longer appends -f for linux mount and uses -i instead to ignore helpers
This commit is contained in:
parent
dfc208bd25
commit
00d596fb43
3
Makefile
3
Makefile
@ -90,6 +90,8 @@ diststatus:
|
||||
distforce:
|
||||
rm -rf /tmp/$(PKG)
|
||||
cp -pPR . /tmp/$(PKG)
|
||||
$(MAKE) -C /tmp/$(PKG) clean
|
||||
(find /tmp/$(PKG) -type d -name .svn -exec rm -rf {} \; 2>/dev/null; exit 0)
|
||||
tar -C /tmp -cvjpf /tmp/$(PKG).tar.bz2 $(PKG)
|
||||
rm -rf /tmp/$(PKG)
|
||||
ls -l /tmp/$(PKG).tar.bz2
|
||||
@ -97,6 +99,7 @@ distforce:
|
||||
distit:
|
||||
rm -rf /tmp/$(PKG)
|
||||
svn export . /tmp/$(PKG)
|
||||
$(MAKE) -C /tmp/$(PKG) clean
|
||||
tar -C /tmp -cvjpf /tmp/$(PKG).tar.bz2 $(PKG)
|
||||
rm -rf /tmp/$(PKG)
|
||||
ls -l /tmp/$(PKG).tar.bz2
|
||||
|
@ -52,8 +52,14 @@ do_unmount() {
|
||||
|
||||
# OK, try forcing things
|
||||
if [ ${retry} -le 0 ] ; then
|
||||
${cmd} -f "${mnt}" || retry=-999
|
||||
retry=-999
|
||||
local extra_opts="-f"
|
||||
case "${cmd}" in
|
||||
mount*)
|
||||
# Silly reiserfs helper blocks us, so bypass it
|
||||
[ "${RC_UNAME}" = "Linux" ] && extra_opts="-i"
|
||||
;;
|
||||
esac
|
||||
${cmd} ${extra_opts} "${mnt}" || retry=-999
|
||||
break
|
||||
fi
|
||||
done
|
||||
|
Loading…
Reference in New Issue
Block a user