emo/openrc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Roy Marples 2007-04-25 12:32:47 +00:00
parent dfc208bd25
commit 00d596fb43
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile
View File

@ -90,6 +90,8 @@ diststatus:
distforce: distforce:
rm -rf /tmp/$(PKG) rm -rf /tmp/$(PKG)
cp -pPR . /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) tar -C /tmp -cvjpf /tmp/$(PKG).tar.bz2 $(PKG)
rm -rf /tmp/$(PKG) rm -rf /tmp/$(PKG)
ls -l /tmp/$(PKG).tar.bz2 ls -l /tmp/$(PKG).tar.bz2
@ -97,6 +99,7 @@ distforce:
distit: distit:
rm -rf /tmp/$(PKG) rm -rf /tmp/$(PKG)
svn export . /tmp/$(PKG) svn export . /tmp/$(PKG)
$(MAKE) -C /tmp/$(PKG) clean
tar -C /tmp -cvjpf /tmp/$(PKG).tar.bz2 $(PKG) tar -C /tmp -cvjpf /tmp/$(PKG).tar.bz2 $(PKG)
rm -rf /tmp/$(PKG) rm -rf /tmp/$(PKG)
ls -l /tmp/$(PKG).tar.bz2 ls -l /tmp/$(PKG).tar.bz2

10
sh/rc-mount.sh
View File

@ -52,8 +52,14 @@ do_unmount() {
# OK, try forcing things # OK, try forcing things
if [ ${retry} -le 0 ] ; then if [ ${retry} -le 0 ] ; then
${cmd} -f "${mnt}" || retry=-999 local extra_opts="-f"
retry=-999 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 break
fi fi
done done