Skip to content

Commit c296821

Browse files
authored
unblob: fix dependency install (#13087)
We recently merged⁰ the Rust part of unblob (so called 'unblob-native') into unblob and re-organized the repository structure in the process. This broke OSS-fuzz integration for unblob since the bash script that installs dependencies no longer lives at this address. [0] onekey-sec/unblob#1096
1 parent ce8ff12 commit c296821

File tree

2 files changed

+19
-4
lines changed

2 files changed

+19
-4
lines changed

projects/unblob/Dockerfile

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,19 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414
FROM gcr.io/oss-fuzz-base/base-builder-python
15-
RUN pip3 install --upgrade pip
15+
1616
RUN git clone https://github.com/onekey-sec/unblob
17-
RUN unblob/unblob/install-deps.sh
18-
RUN pip install ./unblob
17+
18+
RUN apt-get update && apt-get install build-essential libssl-dev libffi-dev pkg-config python3-dev cargo -y
19+
RUN python3 -m pip install --upgrade pip
20+
RUN curl https://sh.rustup.rs -sSf | sh -s -- -y
21+
22+
ENV PATH="/root/.cargo/bin:${PATH}"
23+
RUN rustup install nightly
24+
RUN rustup default nightly
25+
26+
RUN unblob/install-deps.sh
27+
RUN python3 -m pip install ./unblob
1928

2029
COPY build.sh $SRC/
2130
WORKDIR $SRC/unblob

projects/unblob/build.sh

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,13 @@
1414
# limitations under the License.
1515
#
1616
################################################################################
17-
pip3 install .
17+
18+
python3 -m pip cache purge
19+
20+
unset RUSTFLAGS
21+
unset CXXFLAGS
22+
unset CFLAGS
23+
python3 -m pip install .
1824

1925
# Build fuzzers in $OUT.
2026
for fuzzer in $(find $SRC -name '*_fuzzer.py'); do

0 commit comments

Comments
 (0)