Skip to content

Commit b9472f0

Browse files
committed
chore: reconfigure packages and download kernel packages from the correct sources
1 parent f5a8e85 commit b9472f0

File tree

7 files changed

+13
-10
lines changed

7 files changed

+13
-10
lines changed

.devcontainer/Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,8 @@ RUN apk add cmake \
2222
patch \
2323
coreutils \
2424
gettext \
25-
gettext-dev
25+
gettext-dev \
26+
gtk-doc
2627

2728
RUN apk add sudo
2829
RUN adduser -D -u $USER_UID -g $USER_GID $USERNAME \

Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@ RUN apk add cmake \
1717
patch \
1818
coreutils \
1919
gettext \
20-
gettext-dev
20+
gettext-dev \
21+
gtk-doc
2122

2223

2324
RUN mkdir /source

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ this repository will include the musl license in case the main compiler used to
3434

3535
```bash
3636
apk update
37-
apk add cmake make clang llvm git autoconf automake libtool m4 flex bison pkgconfig bash linux-headers patch coreutils gettext gettext-dev
37+
apk add cmake make clang llvm git autoconf automake libtool m4 flex bison pkgconfig bash linux-headers patch coreutils gettext gettext-dev gtk-doc
3838
```
3939

4040
### Configure

dependencies/Libcap.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ endif()
2727

2828
register_dependency(
2929
libcap
30-
"https://git.kernel.org/pub/scm/libs/libcap/libcap.git/snapshot/libcap-2.70.tar.gz"
31-
"18f00ea97c7541af86379dec9d4d8ea838aac4a1f70177d81d91657e4e43b808"
30+
"https://www.kernel.org/pub/linux/libs/security/linux-privs/libcap2/libcap-2.70.tar.gz"
31+
"d3b777ed413c9fafface03b917e171854709b5e4be38dbfb9219aaf7dfd4eea6"
3232
"License"
3333
)
3434

dependencies/Libintl.cmake

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,8 @@ ExternalProject_Add(gettext
3131
UPDATE_DISCONNECTED 1
3232
DOWNLOAD_DIR ${SOURCE_DOWNLOADS_DIR}
3333
DOWNLOAD_NAME ${DEP_gettext_FILENAME}
34-
CONFIGURE_COMMAND <SOURCE_DIR>/configure
34+
UPDATE_COMMAND autoreconf -fiv
35+
CONFIGURE_COMMAND <SOURCE_DIR>/configure
3536
--prefix=${LIBINTL_INSTALL_DIR}
3637
--disable-shared
3738
--enable-static

dependencies/ProtobufC.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ ExternalProject_Add(protobuf-c
3636
UPDATE_DISCONNECTED 1
3737
DOWNLOAD_DIR ${SOURCE_DOWNLOADS_DIR}
3838
DOWNLOAD_NAME ${DEP_protobuf-c_FILENAME}
39-
UPDATE_COMMAND sh -c "test -f <SOURCE_DIR>/configure || <SOURCE_DIR>/autogen.sh"
39+
UPDATE_COMMAND autoreconf -fiv
4040
CONFIGURE_COMMAND ${CMAKE_COMMAND} -E env
4141
"protobuf_CFLAGS=$<TARGET_PROPERTY:protobuf::static,CONSUMER_CFLAGS>"
4242
"protobuf_LIBS=$<TARGET_PROPERTY:protobuf::static,CONSUMER_LDFLAGS>"

dependencies/UtilLinux.cmake

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ endif()
2222

2323
register_dependency(
2424
util_linux
25-
"https://git.kernel.org/pub/scm/utils/util-linux/util-linux.git/snapshot/util-linux-2.41.1.tar.gz"
26-
"61a9785cbf04091286ec2bbfb78e87c35e6380f084f38115a4677b90b9ad4437"
25+
"https://www.kernel.org/pub/linux/utils/util-linux/v2.41/util-linux-2.41.tar.gz"
26+
"c014b5861695b603d0be2ad1e6f10d5838b9d7859e1dd72d01504556817d8a87"
2727
"COPYING"
2828
)
2929

@@ -33,7 +33,7 @@ ExternalProject_Add(util_linux
3333
UPDATE_DISCONNECTED 1
3434
DOWNLOAD_DIR ${SOURCE_DOWNLOADS_DIR}
3535
DOWNLOAD_NAME ${DEP_util_linux_FILENAME}
36-
UPDATE_COMMAND sh -c "test -f <SOURCE_DIR>/configure || <SOURCE_DIR>/autogen.sh"
36+
UPDATE_COMMAND autoreconf -fiv
3737
CONFIGURE_COMMAND <SOURCE_DIR>/configure
3838
--enable-static
3939
--disable-shared

0 commit comments

Comments
 (0)