Skip to content

Commit c357134

Browse files
committed
change name to omitted_licenses
Signed-off-by: Mitchell <mitch_dz@hotmail.com>
1 parent ea37cb3 commit c357134

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

docker/build/package_sources.Dockerfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -176,14 +176,14 @@ RUN echo -e "MACOS pip omitted packages:\n$(cat ${SOURCES_ROOT}/macos/pip/macos_
176176

177177
# For omitted apt packages (no source available), extract license/copyright/EULA from the .deb
178178
RUN echo "Retrieving EULA/copyright for omitted apt packages..." && \
179-
mkdir -p "${SOURCES_ROOT}/apt/licenses" /tmp/deb_extract && \
179+
mkdir -p "${SOURCES_ROOT}/omitted_licenses/apt/" /tmp/deb_extract && \
180180
while IFS= read -r pkg || [ -n "$pkg" ]; do \
181181
[ -z "$pkg" ] && continue; \
182182
( cd /tmp/deb_extract && apt-get download "$pkg" 2>/dev/null ) || true; \
183183
deb=$(ls /tmp/deb_extract/*.deb 2>/dev/null | head -1); \
184184
if [ -n "$deb" ]; then \
185185
dpkg-deb -R "$deb" "/tmp/deb_extract/${pkg}_pkg" 2>/dev/null || true; \
186-
dest="${SOURCES_ROOT}/apt/licenses/${pkg}"; \
186+
dest="${SOURCES_ROOT}/omitted_licenses/apt/${pkg}"; \
187187
mkdir -p "$dest"; \
188188
find "/tmp/deb_extract/${pkg}_pkg" \( -iname "*license*" -o -iname "*eula*" -o -iname "*copyright*" \) -exec cp -a {} "$dest/" \; 2>/dev/null || true; \
189189
rm -rf "/tmp/deb_extract/${pkg}_pkg" /tmp/deb_extract/*.deb; \
@@ -193,7 +193,7 @@ RUN echo "Retrieving EULA/copyright for omitted apt packages..." && \
193193

194194
# For omitted pip packages (no sdist), get EULA/license from the wheel: fetch wheel from PyPI, extract, copy license/EULA/copyright files
195195
RUN echo "Retrieving EULA/license for omitted pip packages..." && \
196-
mkdir -p "${SOURCES_ROOT}/pip/licenses" /tmp/wheel_extract && \
196+
mkdir -p "${SOURCES_ROOT}/omitted_licenses/pip" /tmp/wheel_extract && \
197197
while IFS= read -r package || [ -n "$package" ]; do \
198198
[ -z "$package" ] && continue; \
199199
name="${package%%==*}"; \
@@ -203,7 +203,7 @@ RUN echo "Retrieving EULA/license for omitted pip packages..." && \
203203
if [ -n "$url" ] && [ "$url" != "null" ]; then \
204204
if curl -fsSL -o /tmp/pip_wheel.whl "$url" 2>/dev/null; then \
205205
(cd /tmp/wheel_extract && unzip -o -q /tmp/pip_wheel.whl 2>/dev/null) || true; \
206-
dest="${SOURCES_ROOT}/pip/licenses/${name}"; \
206+
dest="${SOURCES_ROOT}/omitted_licenses/pip/${name}"; \
207207
mkdir -p "$dest"; \
208208
find /tmp/wheel_extract -type f \( -iname "*license*" -o -iname "*eula*" -o -iname "*copyright*" \) -exec cp -an {} "$dest/" \; 2>/dev/null || true; \
209209
if [ -z "$(ls -A "$dest" 2>/dev/null)" ]; then \

0 commit comments

Comments
 (0)