Skip to content

Three patches from the Debian packaging #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
cbiedl wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Three patches from the Debian packaging #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b20ef21
Call mkself directly instead of going via sh
Jo-Con-El Aug 13, 2009
9af5e57
Description: Enable CFLAGS/CPPFLAGS/LDFLAGS from the environment.
Jo-Con-El Jan 13, 2014
0e2b785
Description: Support the new /run/udev location for udev detection.
rleigh-codelibre Jan 18, 2012
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ NPERSHELF=16
CONF_SCRIPTS = aoe-discover aoe-interfaces aoe-mkshelf aoe-revalidate aoe-flush aoe-stat
PROGS = aoeping aoecfg aoe-sancheck
COMMANDS := ${CONF_SCRIPTS} aoe-mkdevs aoe-version coraid-update ${PROGS}
CFLAGS = -Wall -O -g
CFLAGS += -Wall -O -g ${CPPFLAGS}
SANCHECKLIBS = -lpthread

AOE_PING_OBJ = aoeping.o linux.o
Expand Down Expand Up @@ -68,17 +68,17 @@ clean :
rm -f ${CONF_SCRIPTS} ${AOE_PING_OBJ} ${AOE_CFG_OBJ} ${SANCHECK_OBJ} ${PROGS}

aoeping : ${AOE_PING_OBJ}
${CC} ${CFLAGS} -o $@ ${AOE_PING_OBJ}
${CC} ${CFLAGS} ${LDFLAGS} -o $@ ${AOE_PING_OBJ}
aoeping.o : aoeping.c dat.h fns.h
${CC} ${CFLAGS} -o $@ -c $<
linux.o : linux.c config.h
${CC} ${CFLAGS} -o $@ -c $<
aoecfg: ${AOE_CFG_OBJ}
${CC} ${CFLAGS} -o $@ ${AOE_CFG_OBJ}
${CC} ${CFLAGS} ${LDFLAGS} -o $@ ${AOE_CFG_OBJ}
aoecfg.o : aoecfg.c dat.h fns.h
${CC} ${CFLAGS} -o $@ -c $<
aoe-sancheck : ${SANCHECK_OBJ}
-$(CC) $(CFLAGS) -o $@ ${SANCHECK_OBJ} $(SANCHECKLIBS)
-$(CC) $(CFLAGS) ${LDFLAGS} -o $@ ${SANCHECK_OBJ} $(SANCHECKLIBS)
aoe-sancheck.o : aoe-sancheck.c
-$(CC) $(CFLAGS) -o $@ -c $<

4 changes: 2 additions & 2 deletions aoe-mkdevs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ $zero: Exiting.
EOF
exit 1
fi
if test "`ps axwwww | grep 'udev[d]'`" || test -d "/dev/.udev"; then
if test "`ps axwwww | grep 'udev[d]'`" || test -d "/run/udev" || test -d "/dev/.udev"; then
cat 1>&2 <<EOF
$zero Error: udev detected. You shouldn't need to use $zero.
$zero: Please see the aoe-mkdevs manpage.
Expand Down Expand Up @@ -56,6 +56,6 @@ export n_partitions
mkshelf=`echo $0 | sed 's!mkdevs!mkshelf!'`
i=0
while test $i -lt $n_shelves; do
sh $mkshelf $dir $i
$mkshelf $dir $i
i=`expr $i + 1`
done
2 changes: 1 addition & 1 deletion aoe-mkshelf.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ $zero: Exiting.
EOF
exit 1
fi
if test "`ps axwwww | grep 'udev[d]'`" || test -d "/dev/.udev"; then
if test "`ps axwwww | grep 'udev[d]'`" || test -d "/run/udev" || test -d "/dev/.udev"; then
cat 1>&2 <<EOF
$zero Error: udev detected. You shouldn't need to use $zero.
$zero: Please see the aoe-mkshelf manpage.
Expand Down