Selaa lähdekoodia

adk infra: fix regex, otherwise libcjson is not populated to staging dir

Waldemar Brodkorb 3 päivää sitten
vanhempi
commit
b640a79c91
2 muutettua tiedostoa jossa 2 lisäystä ja 2 poistoa
  1. 1 1
      mk/package.mk
  2. 1 1
      mk/pkg-bottom.mk

+ 1 - 1
mk/package.mk

@@ -248,7 +248,7 @@ ifeq (,$(filter nostaging,$(7)))
 	    fi; \
 	    find usr ! -type d 2>/dev/null | \
 	    grep -E -v -e '^usr/lib/pkgconfig' -e '^usr/share' -e '^usr/doc' -e '^usr/src' -e '^usr/man' \
-		       -e '^usr/info' -e '^usr/lib/libc.so' -e '^usr/bin/[a-z0-9-]+-config' -e '^usr/lib/.*\.la$$$$' | \
+		       -e '^usr/info' -e '^usr/lib/libc.so$$$$' -e '^usr/bin/[a-z0-9-]+-config' -e '^usr/lib/.*\.la$$$$' | \
 	    tee '$${STAGING_PKG_DIR}/$(1)' | \
 	    $(CPIO) -padlmu --quiet '$${STAGING_TARGET_DIR}'
 endif

+ 1 - 1
mk/pkg-bottom.mk

@@ -216,7 +216,7 @@ ifeq (,$(filter nostaging,${PKG_OPTS}))
 	@-cd ${WRKINST}; \
 	    find usr ! -type d 2>/dev/null | \
 	    grep -E -v -e '^usr/src' -e '^usr/doc' -e '^usr/local' -e '^usr/man' -e '^usr/info' \
-			-e '^usr/lib/libc.so' -e '^usr/bin/[a-z0-9-]+-config*' -e '^usr/lib/.*\.la$$' \
+			-e '^usr/lib/libc.so$$' -e '^usr/bin/[a-z0-9-]+-config*' -e '^usr/lib/.*\.la$$' \
 			-e '^/usr/lib/libpthread_nonshared.a' | \
 	    tee '${STAGING_PKG_DIR}/${PKG_NAME}' | \
 	    $(CPIO) -padlmu --quiet '${STAGING_TARGET_DIR}'