aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge stage-aosp-master into pi-dev-plus-aospandroid-mainline-10.0.0_r9android-mainline-10.0.0_r7android-mainline-10.0.0_r5android-mainline-10.0.0_r4android-mainline-10.0.0_r10android-10.0.0_r9android-10.0.0_r8android-10.0.0_r7android-10.0.0_r45android-10.0.0_r44android-10.0.0_r43android-10.0.0_r42android-10.0.0_r41android-10.0.0_r40android-10.0.0_r39android-10.0.0_r38android-10.0.0_r37android-10.0.0_r36android-10.0.0_r35android-10.0.0_r34android-10.0.0_r33android-10.0.0_r32android-10.0.0_r31android-10.0.0_r30android-10.0.0_r29android-10.0.0_r28android-10.0.0_r27android-10.0.0_r26android-10.0.0_r25android-10.0.0_r24android-10.0.0_r23android-10.0.0_r22android-10.0.0_r21android-10.0.0_r20android-10.0.0_r19android-10.0.0_r18android-10.0.0_r16android-10.0.0_r15android-10.0.0_r14android-10.0.0_r13android-10.0.0_r12android10-qpr3-s1-releaseandroid10-qpr3-releaseandroid10-qpr2-s4-releaseandroid10-qpr2-s3-releaseandroid10-qpr2-s2-releaseandroid10-qpr2-s1-releaseandroid10-qpr2-releaseandroid10-qpr1-releaseandroid10-qpr1-mainline-releaseandroid10-qpr1-d-releaseandroid10-qpr1-c-s1-releaseandroid10-qpr1-c-releaseandroid10-qpr1-b-s1-releaseandroid10-qpr1-b-releaseandroid10-mainline-media-releaseandroid10-devandroid10-d4-s1-releaseandroid10-d4-releaseandroid10-c2f2-s2-releaseandroid10-c2f2-s1-releaseandroid10-c2f2-releaseXin Li2019-02-250-0/+0
|\ | | | | | | | | | | am: 9c7e0abee3 Change-Id: I33c1d0b2a151119bd3f4e0eaae4b38fcaaa2fcaa
| * Merge stage-aosp-master into pi-dev-plus-aospXin Li2019-02-250-0/+0
| |\ | | | | | | | | | | | | Bug: 126125118 Change-Id: I09d14fc2a01c08a9fd10e6030fd8720b20e34014
| | * DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-masterXin Li2019-02-200-0/+0
| | |\ | | | | | | | | | | | | | | | | Bug: 120848293 Change-Id: Ia237183637cd6ba3d1da2954ac1bb8c195105b13
* | | | Merge "iproute2: remove ek, add satk to OWNERS" am: f3a8012094 am: eecc645a30Maciej Żenczykowski2019-01-281-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | am: 715492c6fb Change-Id: I87614aada42ab4891b4c39941f1f2168fd8c2682
| * | | Merge "iproute2: remove ek, add satk to OWNERS" am: f3a8012094Maciej Żenczykowski2019-01-281-1/+1
| |\| | | | | | | | | | | | | | | | | | | | | | am: eecc645a30 Change-Id: I0019d58b46a7f28c4d63d70b8d933a6f94ffc0c5
| | * | Merge "iproute2: remove ek, add satk to OWNERS"Maciej Żenczykowski2019-01-281-1/+1
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | am: f3a8012094 Change-Id: I1caf7e1ca24f3439613c7938d17cbed78989d4b6
| | | * \ Merge "iproute2: remove ek, add satk to OWNERS"Treehugger Robot2019-01-281-1/+1
| | | |\ \
| | | | * | iproute2: remove ek, add satk to OWNERSMaciej Żenczykowski2019-01-281-1/+1
| | | |/ / | | | | | | | | | | | | | | | | | | | | Signed-off-by: Maciej Żenczykowski <maze@google.com> Change-Id: I22f83786212e43961d35ee7cebaaa93fdd4c76b8
* | | | | Merge changes I0af6a8c1,Ia77fd91e,Ib26b3167,Ic6e7afd9,I58752686 am: ↵Maciej Żenczykowski2019-01-2814-106/+4302
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 90a033c688 am: d44aa8b9cc am: ea4d1ebf3c Change-Id: I2bf3af4100f3db950567f8f8d50925fbf2402a02
| * | | | Merge changes I0af6a8c1,Ia77fd91e,Ib26b3167,Ic6e7afd9,I58752686 am: 90a033c688Maciej Żenczykowski2019-01-2814-106/+4302
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | am: d44aa8b9cc Change-Id: I2e1420e1d966413a10cac0aaa347e816a98a2b40
| | * | | Merge changes I0af6a8c1,Ia77fd91e,Ib26b3167,Ic6e7afd9,I58752686Maciej Żenczykowski2019-01-2814-106/+4302
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | am: 90a033c688 Change-Id: I566d008bb849f4b72031ae1f845ba624298a41f0
| | | * | Merge changes I0af6a8c1,Ia77fd91e,Ib26b3167,Ic6e7afd9,I58752686Maciej Żenczykowski2019-01-2814-106/+4302
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * changes: iproute2: static compile. iproute2: support more qdiscs iproute2: support filters besides u32 iproute2: support actions besides mirred iproute2: re-enable batching
| | | | * | iproute2: static compile.Maciej Żenczykowski2019-01-2511-48/+4302
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now that we've reverted most ANDROID specific patches, we need to actually make it build correctly. This switches on NO_SHARED_LIBS (due to issues with dlopen/dlsym) and enables tons of things, plus it mostly sorts the build files - they can't be fully sorted because link order affects symbol resolution. Things that still aren't enabled in ip/Android.bp: iplink_bond.c iplink_bond_slave.c rtmon.c (bonding due to use of 'strdupa' stack string allocation, and rtmon is an entirely separate binary) Things that still aren't enabled in tc/Android.bp: m_ipt.c m_nat.c m_xt.c m_xt_old.c q_atm.c (various compile problems, missing headers, etc) We also check in {ip/tc}/static-syms.h built via: rm -f {ip,tc}/static-syms.h touch config.mk SHARED_LIBS=n make -C ip static-syms.h SHARED_LIBS=n make -C tc static-syms.h rm -f config.mk and check-in yacc/lex output built via: rm -f tc/emp_ematch.yacc.output tc/emp_ematch.yacc.h tc/emp_ematch.yacc.c tc/emp_ematch.lex.c touch config.mk YACCFLAGS='-d -t -v' make -C tc emp_ematch.{yacc,lex}.c rm -f config.mk which require bison/flex. Furthermore we update .gitignore files to allow submitting these build outputs. Longer term we should probably make it actually generate these during the build. Only files which were manually edited were the three Android.bp files and two .gitignore files. The other six are autogenerated (see above). Note: this exposes incompatible with userspace api kernel change: commit abb705d4ef835b637e0213f34a6fe991f8c273db 'net_sched: Add flow control support to prio qdisc' which includes: struct tc_prio_qopt { int bands; /* Number of bands */ __u8 priomap[TC_PRIO_MAX+1]; /* Map: logical priority -> PRIO band */ + __u8 enable_flow; /* Enable dequeue */ }; and results in: !!!Deficit -4, rta_len=48 (if enable_flow == 0) !!!Deficit -3, rta_len=48 (if enable_flow == 1) Bug: 65674744 Signed-off-by: Maciej Żenczykowski <maze@google.com> Change-Id: I0af6a8c1f8aede2e999a41a48038cb4e167d481c
| | | | * | iproute2: support more qdiscsMaciej Żenczykowski2019-01-251-18/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (probably not useful without rest of patch series) Bug: 65674744 Signed-off-by: Maciej Żenczykowski <maze@google.com> Change-Id: Ia77fd91eeac800429830e21bb1b368cda329a51f
| | | | * | iproute2: support filters besides u32Maciej Żenczykowski2019-01-251-9/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (probably not useful without rest of patch series) Bug: 65674744 Signed-off-by: Maciej Żenczykowski <maze@google.com> Change-Id: Ib26b31675197c7faf459cc7b9d93b5dd6ce8e596
| | | | * | iproute2: support actions besides mirredMaciej Żenczykowski2019-01-251-11/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (probably not useful without rest of patch series) Bug: 65674744 Signed-off-by: Maciej Żenczykowski <maze@google.com> Change-Id: Ic6e7afd98b0980db87d7eb2b33ce08d720cfbf1c
| | | | * | iproute2: re-enable batchingMaciej Żenczykowski2019-01-252-20/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (probably not useful without rest of patch series) Bug: 65674744 Signed-off-by: Maciej Żenczykowski <maze@google.com> Change-Id: I58752686f3e1583960e842aa7e3ae66b2446f97b
* | | | | | Merge "iproute2: add maze to OWNERS" am: bfde7e0d24 am: 1316271023Maciej Żenczykowski2019-01-281-0/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 9edf224c24 Change-Id: I808f9078ad9876519e44688098e62eb3f70a325b
| * | | | | Merge "iproute2: add maze to OWNERS" am: bfde7e0d24Maciej Żenczykowski2019-01-281-0/+1
| |\| | | | | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | am: 1316271023 Change-Id: I53587ec02e1385fc76fa0d7a0a07151b94cd3e82
| | * | | Merge "iproute2: add maze to OWNERS"Maciej Żenczykowski2019-01-271-0/+1
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | am: bfde7e0d24 Change-Id: Idd122e9daaa111d583958b8975ab39c2a7981ca5
| | | * | Merge "iproute2: add maze to OWNERS"Maciej Żenczykowski2019-01-281-0/+1
| | | |\|
| | | | * iproute2: add maze to OWNERSMaciej Żenczykowski2019-01-251-0/+1
| | | |/ | | | | | | | | | | | | | | | | Signed-off-by: Maciej Żenczykowski <maze@google.com> Change-Id: If7feb012b83bb0fe173842753793b85d875048a5
* | | | Merge "Convert to Android.bp" am: d81c8f2604 am: 5cbed885ddDan Willemsen2018-11-1910-191/+219
|\| | | | | | | | | | | | | | | | | | | | | | | am: e67d92e26b Change-Id: Ic0bd5bde18cbacc9b9423947be158da50a7c1768
| * | | Merge "Convert to Android.bp" am: d81c8f2604Dan Willemsen2018-11-1910-191/+219
| |\| | | | | | | | | | | | | | | | | | | | | | am: 5cbed885dd Change-Id: I3e22c05a39923da8e6d5718e077327dd53a6e438
| | * | Merge "Convert to Android.bp"Dan Willemsen2018-11-1910-191/+219
| | |\| | | | | | | | | | | | | | | | | | | | | am: d81c8f2604 Change-Id: Ic7f2f82715ccfb3278c66a69fac18206eac2ac02
| | | * Merge "Convert to Android.bp"Dan Willemsen2018-11-2010-191/+219
| | | |\
| | | | * Convert to Android.bpDan Willemsen2018-11-1810-191/+219
| | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See build/soong/README.md for more information ss was added to PRODUCT_PACKAGES_DEBUG in base_system.mk, as module tagging is not supported in Soong. Test: cd external/iproute2; mma Change-Id: I8b44e240d998e47b8ffc60e951451d570a8ae025
* | | | [automerger skipped] Merge pie-platform-release to aosp-master - DO NOT ↵Bill Yi2018-10-240-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MERGE am: f13d12fe9c -s ours am: 82b968c6d9 -s ours am: 9839be66bf -s ours Change-Id: Ide9c9a9f0bf5b6a1b0522f8277bcedc2a69e08c0
| * | | [automerger skipped] Merge pie-platform-release to aosp-master - DO NOT ↵Bill Yi2018-10-240-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MERGE am: f13d12fe9c -s ours am: 82b968c6d9 -s ours Change-Id: I1203372b613d1517a5e02f4ce6d5de85a85df2a1
| | * | [automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGEBill Yi2018-10-240-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | am: f13d12fe9c -s ours Change-Id: I89e36d521fb3c4578d8b49711a6829cfe2e27f09
| | | * Merge pie-platform-release to aosp-master - DO NOT MERGEBill Yi2018-10-240-0/+0
| | | |\ | | | | | | | | | | | | | | | Change-Id: I95161c25a5646f3f62e5168561eec895325e95a4
* | | | | [automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT ↵Bill Yi2018-10-240-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MERGE am: 64b44f814b -s ours am: b002c9bc7b -s ours Change-Id: I8333a3c0e3f804bd76acc9971335e4e1dc307612
| * | | | [automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT ↵Bill Yi2018-10-240-0/+0
| |\| | | | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | MERGE am: 64b44f814b -s ours Change-Id: Iabb144c2750571585d280d1bbc3459e0239beefc
| | * | Merge pi-platform-release to stage-aosp-master - DO NOT MERGEBill Yi2018-10-240-0/+0
| |/| | | | |/ | | | | | | Change-Id: Ie5c73a91723957db06f9ee1930f32e0c71bc5574
| | * Snap for 4468711 from 2d868b48b2f313deb4853e8ac5047d05132969c5 to pi-releaseandroid-vts-9.0_r9android-vts-9.0_r8android-vts-9.0_r7android-vts-9.0_r6android-vts-9.0_r5android-vts-9.0_r4android-vts-9.0_r14android-vts-9.0_r13android-vts-9.0_r12android-vts-9.0_r11android-vts-9.0_r10android-p-preview-5android-p-preview-4android-p-preview-1android-cts-9.0_r9android-cts-9.0_r8android-cts-9.0_r7android-cts-9.0_r6android-cts-9.0_r5android-cts-9.0_r4android-cts-9.0_r3android-cts-9.0_r2android-cts-9.0_r13android-cts-9.0_r12android-cts-9.0_r11android-cts-9.0_r10android-cts-9.0_r1android-9.0.0_r9android-9.0.0_r8android-9.0.0_r7android-9.0.0_r60android-9.0.0_r6android-9.0.0_r59android-9.0.0_r58android-9.0.0_r57android-9.0.0_r56android-9.0.0_r55android-9.0.0_r54android-9.0.0_r53android-9.0.0_r52android-9.0.0_r51android-9.0.0_r50android-9.0.0_r5android-9.0.0_r49android-9.0.0_r48android-9.0.0_r3android-9.0.0_r2android-9.0.0_r18android-9.0.0_r17android-9.0.0_r10android-9.0.0_r1security-pi-releasepie-vts-releasepie-security-releasepie-s2-releasepie-release-2pie-releasepie-r2-s2-releasepie-r2-s1-releasepie-r2-releasepie-platform-releasepie-gsipie-cuttlefish-testingpie-cts-releasepie-arcp-preview-1android-build-team Robot2017-11-26465-14645/+42033
| | |\ | | | | | | | | | | | | Change-Id: Ic9de3ebd76d093ed177a6197aee2a9beaed4a247
* | | | Merge "UPSTREAM: ip-xfrm: Add support for OUTPUT_MARK" am: 4abfdca336 am: ↵Subash Abhinov Kasiviswanathan2018-06-213-1/+36
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 20c0f1de5d am: 14c09fbc57 Change-Id: I0b47cdd12d59105a96c7104fc65bbaee359d0060
| * | | Merge "UPSTREAM: ip-xfrm: Add support for OUTPUT_MARK" am: 4abfdca336Subash Abhinov Kasiviswanathan2018-06-213-1/+36
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | am: 20c0f1de5d Change-Id: I0389b742077b1a3c66c903a10369ca016c5b10f2
| | * | | Merge "UPSTREAM: ip-xfrm: Add support for OUTPUT_MARK"master-cuttlefish-testing-releaseSubash Abhinov Kasiviswanathan2018-06-213-1/+36
| |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 4abfdca336 Change-Id: Icac07d1383ca4eea24e0a196d41182e0b894ab33
| | * | | Merge "UPSTREAM: ip-xfrm: Add support for OUTPUT_MARK"Treehugger Robot2018-06-213-1/+36
| | |\ \ \
| | | * | | UPSTREAM: ip-xfrm: Add support for OUTPUT_MARKSubash Abhinov Kasiviswanathan2018-06-203-1/+36
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds support for OUTPUT_MARK in xfrm state to exercise the functionality added by kernel commit 077fbac405bf ("net: xfrm: support setting an output mark."). Sample output- (with mark and output-mark) src 192.168.1.1 dst 192.168.1.2 proto esp spi 0x00004321 reqid 0 mode tunnel replay-window 0 flag af-unspec mark 0x10000/0x3ffff output-mark 0x20000 auth-trunc xcbc(aes) 0x3ed0af408cf5dcbf5d5d9a5fa806b211 96 enc cbc(aes) 0x3ed0af408cf5dcbf5d5d9a5fa806b233 anti-replay context: seq 0x0, oseq 0x0, bitmap 0x00000000 (with mark only) src 192.168.1.1 dst 192.168.1.2 proto esp spi 0x00004321 reqid 0 mode tunnel replay-window 0 flag af-unspec mark 0x10000/0x3ffff auth-trunc xcbc(aes) 0x3ed0af408cf5dcbf5d5d9a5fa806b211 96 enc cbc(aes) 0x3ed0af408cf5dcbf5d5d9a5fa806b233 anti-replay context: seq 0x0, oseq 0x0, bitmap 0x00000000 (with output-mark only) src 192.168.1.1 dst 192.168.1.2 proto esp spi 0x00004321 reqid 0 mode tunnel replay-window 0 flag af-unspec output-mark 0x20000 auth-trunc xcbc(aes) 0x3ed0af408cf5dcbf5d5d9a5fa806b211 96 enc cbc(aes) 0x3ed0af408cf5dcbf5d5d9a5fa806b233 anti-replay context: seq 0x0, oseq 0x0, bitmap 0x00000000 (no mark and output-mark) src 192.168.1.1 dst 192.168.1.2 proto esp spi 0x00004321 reqid 0 mode tunnel replay-window 0 flag af-unspec auth-trunc xcbc(aes) 0x3ed0af408cf5dcbf5d5d9a5fa806b211 96 enc cbc(aes) 0x3ed0af408cf5dcbf5d5d9a5fa806b233 anti-replay context: seq 0x0, oseq 0x0, bitmap 0x00000000 v1->v2: Moved the XFRMA_OUTPUT_MARK print after XFRMA_MARK in xfrm_xfrma_print() as mentioned by Lorenzo v2->v3: Fix one help formatting error as mentioned by Lorenzo. Keep mark and output-mark on the same line and add man page info as mentioned by David. Signed-off-by: Subash Abhinov Kasiviswanathan <subashab@codeaurora.org> Signed-off-by: David Ahern <dsahern@gmail.com> (cherry picked from commit 2ecb61a0c2ceecbbb6ea5325a1770af9573b6953) Change-Id: I6db8c81d261d2c0b763db8cb095d9ead927d0e1a
* | | | | Merge changes I16e45b38,I150ade94 am: f887894039 am: f72b896afbPavel Maltsev2018-06-075-1/+14
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: eaa5760933 Change-Id: I0aac6076556771db0487ffe74f9da9a69c484f62
| * | | | Merge changes I16e45b38,I150ade94 am: f887894039Pavel Maltsev2018-06-075-1/+14
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: f72b896afb Change-Id: I765a7ba2a07db6587d0b2439e275131917eb5e2a
| | * | | | Merge changes I16e45b38,I150ade94Pavel Maltsev2018-06-075-1/+14
| |/| | | | | | |/ / / | | | | | | | | | | | | | | | | | | | | am: f887894039 Change-Id: If5186f053a4380b657352658311c17234ac7ac16
| | * | | Merge changes I16e45b38,I150ade94Treehugger Robot2018-06-075-1/+14
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * changes: Allow to configure NETNS_RUN_DIR through .mk files Allow to configure /var/run/netns directory
| | | * | | Allow to configure NETNS_RUN_DIR through .mk filesPavel Maltsev2018-06-063-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Without this change ip-netns will use /var/run/netns directory to store namespace information which doesn't exist on Android. This CL adds ability to specify NETNS_RUN_DIR when building for Android. Also, it sets the directory to store namespace to /mnt/run if it wasn't configured previously. Bug: 73334854 Test: NETNS_RUN_DIR=/mnt/vendor m && emulator Test: adb root && adb shell /system/bin/ip add my-net Change-Id: I16e45b38250b3e8d655e470a5a2f6a043c2dff09
| | | * | | Allow to configure /var/run/netns directoryPavel Maltsev2018-06-062-1/+10
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently NETNS_RUN_DIR is hardcoded and refers to /var/run/netns. However, some systems (e.g. Android) doesn't have /var which results in error attempts to create network namespaces on these systems. This change makes NETNS_RUN_DIR configurable at build time by allowing to pass environment variable to make command. Also, this change makes /etc/netns directory configurable through NETNS_ETC_DIR environment variable. For example: ./configure && NETNS_RUN_DIR=/mnt/vendor/netns make Tested: verified that iproute2 with configuration mentioned above creates namespaces in /mnt/vendor/netns (Cherry-picked without modifications) Signed-off-by: Pavel Maltsev <pavelm@google.com> Signed-off-by: Stephen Hemminger <stephen@networkplumber.org> Test: m Bug: 73334854 Change-Id: I150ade94de7fbf99b894072d2f69baff273349a5
* | | | / Merge "Compile ss(8) with HAVE_SELINUX." am: 2392dac63f am: 19b1cbd944Robert Sesek2018-04-181-2/+3
|\| | | | | |_|_|/ |/| | | | | | | | | | | | | | | am: 53b5acc4c4 Change-Id: Id754be1c433359cefd9da1449d64c6d41d0fc38b
| * | | Merge "Compile ss(8) with HAVE_SELINUX." am: 2392dac63fRobert Sesek2018-04-181-2/+3
|/| | | | | | | | | | | | | | | | | | | | | | | am: 19b1cbd944 Change-Id: I2b5c13fece893a92819a0b5c592820f0d42575ac
| * | | Merge "Compile ss(8) with HAVE_SELINUX."Robert Sesek2018-04-181-2/+3
| |\| | | | | | | | | | | | | | | | | | | | | | am: 2392dac63f Change-Id: I7e8a7f33f7d7a47442459a9e023f3154eccfadf5
| | * | Merge "Compile ss(8) with HAVE_SELINUX."android-wear-p-preview-2Treehugger Robot2018-04-191-2/+3
| |/| |
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-12 12:17:14 +0000