[Asterisk-code-review] build: Fix deb build issues with fakeroot (asterisk[13])

Walter Doekes asteriskteam at digium.com
Fri Mar 31 02:45:29 CDT 2017


Walter Doekes has posted comments on this change. ( https://gerrit.asterisk.org/5344 )

Change subject: build: Fix deb build issues with fakeroot
......................................................................


Patch Set 9:

Might I suggest the following.

We'll want to remove /usr/lib64/[[asterisk/modules/***]]
not just /usr/lib64/asterisk/modules/[[***]] (uninstall) or
/usr/lib64/asterisk/[[modules/***]] (uninstall-all).


```
diff --git a/Makefile b/Makefile
index 91fbc24..b641377 100644
--- a/Makefile
+++ b/Makefile
@@ -704,8 +704,8 @@ check-old-libdir:
 		echo "  * Run 'make uninstall' to remove the incorrect libraries" ;\
 		echo "    then run 'make install' again." ;\
 		echo "  * Manually remove the libraries from" ;\
-		echo "   $(_oldlibdir)" ;\
-		echo "   and run 'ldconfig' to rebuild the linker cache." ;\
+		echo "    $(_oldlibdir)" ;\
+		echo "    and run 'ldconfig' to rebuild the linker cache." ;\
 		echo "" ;\
 		echo " WARNING WARNING WARNING" ;\
 	fi
@@ -970,7 +970,10 @@ main-binuninstall:
 
 _uninstall: $(SUBDIRS_UNINSTALL) main-binuninstall
 	rm -f "$(DESTDIR)$(ASTMODDIR)/"*
-	test -n "$(_oldmoddir)" -a -d "$(_oldmoddir)" && rm -f "$(_oldmoddir)/"* || :
+	if test -n "$(_oldmoddir)" -a -d "$(_oldmoddir)"; then \
+		rm -f "$(_oldmoddir)"/* || : ; \
+		rmdir -p "$(_oldmoddir)" || : ; \
+	fi
 	rm -f "$(DESTDIR)$(ASTSBINDIR)/astgenkey"
 	rm -f "$(DESTDIR)$(ASTSBINDIR)/autosupport"
 	rm -rf "$(DESTDIR)$(ASTHEADERDIR)"
@@ -1003,7 +1006,6 @@ uninstall: _uninstall
 
 uninstall-all: _uninstall
 	rm -rf "$(DESTDIR)$(ASTMODDIR)"
-	test -n "$(_oldmoddir)" -a -d "$(_oldmoddir)" && rm -rf "$(_oldmoddir)" || :
 	rm -rf "$(DESTDIR)$(ASTVARLIBDIR)"
 	rm -rf "$(DESTDIR)$(ASTDATADIR)"
 	rm -rf "$(DESTDIR)$(ASTSPOOLDIR)"
```

ZGlmZiAtLWdpdCBhL01ha2VmaWxlIGIvTWFrZWZpbGUKaW5kZXggOTFmYmMyNC4uYjY0MTM3NyAx
MDA2NDQKLS0tIGEvTWFrZWZpbGUKKysrIGIvTWFrZWZpbGUKQEAgLTcwNCw4ICs3MDQsOCBAQCBj
aGVjay1vbGQtbGliZGlyOgogCQllY2hvICIgICogUnVuICdtYWtlIHVuaW5zdGFsbCcgdG8gcmVt
b3ZlIHRoZSBpbmNvcnJlY3QgbGlicmFyaWVzIiA7XAogCQllY2hvICIgICAgdGhlbiBydW4gJ21h
a2UgaW5zdGFsbCcgYWdhaW4uIiA7XAogCQllY2hvICIgICogTWFudWFsbHkgcmVtb3ZlIHRoZSBs
aWJyYXJpZXMgZnJvbSIgO1wKLQkJZWNobyAiICAgJChfb2xkbGliZGlyKSIgO1wKLQkJZWNobyAi
ICAgYW5kIHJ1biAnbGRjb25maWcnIHRvIHJlYnVpbGQgdGhlIGxpbmtlciBjYWNoZS4iIDtcCisJ
CWVjaG8gIiAgICAkKF9vbGRsaWJkaXIpIiA7XAorCQllY2hvICIgICAgYW5kIHJ1biAnbGRjb25m
aWcnIHRvIHJlYnVpbGQgdGhlIGxpbmtlciBjYWNoZS4iIDtcCiAJCWVjaG8gIiIgO1wKIAkJZWNo
byAiIFdBUk5JTkcgV0FSTklORyBXQVJOSU5HIiA7XAogCWZpCkBAIC05NzAsNyArOTcwLDEwIEBA
IG1haW4tYmludW5pbnN0YWxsOgogCiBfdW5pbnN0YWxsOiAkKFNVQkRJUlNfVU5JTlNUQUxMKSBt
YWluLWJpbnVuaW5zdGFsbAogCXJtIC1mICIkKERFU1RESVIpJChBU1RNT0RESVIpLyIqCi0JdGVz
dCAtbiAiJChfb2xkbW9kZGlyKSIgLWEgLWQgIiQoX29sZG1vZGRpcikiICYmIHJtIC1mICIkKF9v
bGRtb2RkaXIpLyIqIHx8IDoKKwlpZiB0ZXN0IC1uICIkKF9vbGRtb2RkaXIpIiAtYSAtZCAiJChf
b2xkbW9kZGlyKSI7IHRoZW4gXAorCQlybSAtZiAiJChfb2xkbW9kZGlyKSIvKiB8fCA6IDsgXAor
CQlybWRpciAtcCAiJChfb2xkbW9kZGlyKSIgfHwgOiA7IFwKKwlmaQogCXJtIC1mICIkKERFU1RE
SVIpJChBU1RTQklORElSKS9hc3RnZW5rZXkiCiAJcm0gLWYgIiQoREVTVERJUikkKEFTVFNCSU5E
SVIpL2F1dG9zdXBwb3J0IgogCXJtIC1yZiAiJChERVNURElSKSQoQVNUSEVBREVSRElSKSIKQEAg
LTEwMDMsNyArMTAwNiw2IEBAIHVuaW5zdGFsbDogX3VuaW5zdGFsbAogCiB1bmluc3RhbGwtYWxs
OiBfdW5pbnN0YWxsCiAJcm0gLXJmICIkKERFU1RESVIpJChBU1RNT0RESVIpIgotCXRlc3QgLW4g
IiQoX29sZG1vZGRpcikiIC1hIC1kICIkKF9vbGRtb2RkaXIpIiAmJiBybSAtcmYgIiQoX29sZG1v
ZGRpcikiIHx8IDoKIAlybSAtcmYgIiQoREVTVERJUikkKEFTVFZBUkxJQkRJUikiCiAJcm0gLXJm
ICIkKERFU1RESVIpJChBU1REQVRBRElSKSIKIAlybSAtcmYgIiQoREVTVERJUikkKEFTVFNQT09M
RElSKSIK

-- 
To view, visit https://gerrit.asterisk.org/5344
To unsubscribe, visit https://gerrit.asterisk.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I51739d4a03e60bff38be719b8d2ead0007afdd51
Gerrit-PatchSet: 9
Gerrit-Project: asterisk
Gerrit-Branch: 13
Gerrit-Owner: Walter Doekes <walter+asterisk at wjd.nu>
Gerrit-Reviewer: Anonymous Coward #1000019
Gerrit-Reviewer: Corey Farrell <git at cfware.com>
Gerrit-Reviewer: George Joseph <gjoseph at digium.com>
Gerrit-Reviewer: Matthew Fredrickson <creslin at digium.com>
Gerrit-Reviewer: Walter Doekes <walter+asterisk at wjd.nu>
Gerrit-HasComments: No



More information about the asterisk-code-review mailing list