Commit ddd38a5e authored by Pawel Wodkowski's avatar Pawel Wodkowski Committed by Jim Harris
Browse files

configure: remove CONFIG.local symlink 



nvme-cli is updated to use mk/config.mk so we can now remove
CONFIG.local symlink.

Change-Id: I7d39c2559e43198b9e0bc4519edaa1cb3180de07
Signed-off-by: default avatarPawel Wodkowski <pawelx.wodkowski@intel.com>
Reviewed-on: https://review.gerrithub.io/428373


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
Chandler-Test-Pool: SPDK Automated Test System <sys_sgsw@intel.com>
parent 840b9225

configure

+0 −3
Original line number Diff line number Diff line
@@ -385,9 +385,6 @@ rm -f mk/config.mk.bak 
[ -n "$LDFLAGS" ] && echo "LDFLAGS?=$LDFLAGS" >> mk/config.mk

[ -n "$DESTDIR" ] && echo "DESTDIR?=$DESTDIR" >> mk/config.mk



# When nvme-cli repo will be update this link can be removed

ln -fs mk/config.mk CONFIG.local



echo "done."



if [[ "$OSTYPE" == "freebsd"* ]]; then

scripts/genconfig.py

+2 −2
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ for arg in sys.argv: 


defs = {}

try:

    with open("CONFIG.local") as f:

    with open("mk/config.mk") as f:

        for line in f:

            line = line.strip()

            if not comment.match(line):
@@ -37,7 +37,7 @@ try: 
                        strval = val.replace('"', '\"')

                        defs["SPDK_{0}".format(var)] = strval

except IOError:

    print("CONFIG.local not found")

    print("mk/config.mk not found")



for key, value in sorted(defs.items()):

    if value == 0: