diff --git a/mk.sh b/mk.sh index 89019fd..9cfe556 100755 --- a/mk.sh +++ b/mk.sh @@ -40,6 +40,7 @@ source "$SCRIPTDIR/util/download.sh" source "$SCRIPTDIR/util/pkgcmd.sh" source "$SCRIPTDIR/util/toolchain.sh" source "$SCRIPTDIR/util/cmake.sh" +source "$SCRIPTDIR/util/misc.sh" ############################## build toolchain ############################### echo "--- resolving toolchain dependencies ---" diff --git a/pkg/coreutils/build b/pkg/coreutils/build index 6e5e993..4f07c59 100755 --- a/pkg/coreutils/build +++ b/pkg/coreutils/build @@ -6,11 +6,7 @@ SHA256SUM="1117b1a16039ddd84d51a9923948307cfa28c2cea03d1a2438742253df0a0c65" DEPENDS="" prepare() { - local PKGSCRIPTDIR="$1" - - for PATCH in ${PKGSCRIPTDIR}/*.patch; do - patch -p1 < $PATCH - done + apply_patches } build() { diff --git a/pkg/iproute2/build b/pkg/iproute2/build index 86f7c79..c906f03 100755 --- a/pkg/iproute2/build +++ b/pkg/iproute2/build @@ -6,11 +6,7 @@ SHA256SUM="d43ac068afcc350a448f4581b6e292331ef7e4e7aa746e34981582d5fdb10067" DEPENDS="bdb libmnl" prepare() { - local PKGSCRIPTDIR="$1" - - for PATCH in ${PKGSCRIPTDIR}/*.patch; do - patch -p1 < $PATCH - done + apply_patches } build() { diff --git a/pkg/openrc/build b/pkg/openrc/build index 780c9fa..b3892b4 100755 --- a/pkg/openrc/build +++ b/pkg/openrc/build @@ -16,11 +16,7 @@ build() { cp -R ${SOURCE}/* ${BUILD} - for i in ${SCRIPTDIR}/${PKGDIR}/${PKGNAME}/*.patch; do - patch -p1 < $i - done - - unset -v i + apply_patches make CC=${TARGET}-gcc AR=${TARGET}-ar RANLIB=${TARGET}-ranlib \ LD=${TARGET}-ld LIBTERMCAP="-lncursesw" \ diff --git a/pkg/procps-ng/build b/pkg/procps-ng/build index 4738e9d..1fce273 100755 --- a/pkg/procps-ng/build +++ b/pkg/procps-ng/build @@ -6,11 +6,7 @@ SHA256SUM="6ed65ab86318f37904e8f9014415a098bec5bc53653e5d9ab404f95ca5e1a7d4" DEPENDS="ncurses" prepare() { - local PKGSCRIPTDIR="$1" - - for PATCH in ${PKGSCRIPTDIR}/*.patch; do - patch -p1 < $PATCH - done + apply_patches } build() { diff --git a/pkg/util-linux/build b/pkg/util-linux/build index f7edfe9..eeb7428 100755 --- a/pkg/util-linux/build +++ b/pkg/util-linux/build @@ -6,11 +6,7 @@ SHA256SUM="f9be7cdcf4fc5c5064a226599acdda6bdf3d86c640152ba01ea642d91108dc8a" DEPENDS="bash ncurses zlib" prepare() { - local PKGSCRIPTDIR="$1" - - for PATCH in ${PKGSCRIPTDIR}/*.patch; do - patch -p1 < $PATCH - done + apply_patches } build() { diff --git a/util/misc.sh b/util/misc.sh new file mode 100644 index 0000000..738bdec --- /dev/null +++ b/util/misc.sh @@ -0,0 +1,7 @@ +apply_patches() { + local PATCH + + for PATCH in $SCRIPTDIR/$PKGDIR/$PKGNAME/*.patch; do + patch -p1 < $PATCH + done +}