diff --git a/pkg/linux-lts/build b/pkg/linux-lts/build index 0ac368a..e06b43a 100755 --- a/pkg/linux-lts/build +++ b/pkg/linux-lts/build @@ -37,8 +37,8 @@ build() { local INITRDLIST="$INITRDDIR/initrd.list" local LINUX_CPU=$(get_linux_cpu) - pkg install -omLD -R "$REPODIR" -r "$INITRDDIR" initrd - pkg install -R "$REPODIR" -r "$INITRDDIR" -l initrd initrd > "$INITRDLIST" + pkg install -omLD -r "$INITRDDIR" initrd + pkg install -r "$INITRDDIR" -l initrd initrd > "$INITRDLIST" export KBUILD_OUTPUT="$PKGBUILDDIR" diff --git a/pkg/release-alix/build b/pkg/release-alix/build index 8bfdc56..46d4ca9 100755 --- a/pkg/release-alix/build +++ b/pkg/release-alix/build @@ -2,7 +2,7 @@ DEPENDS="rootfs linux" SUBPKG="release" build() { - pkg install -om -r "$PKGBUILDDIR/$OS_RELEASE" -R "$REPODIR" linux + pkg install -om -r "$PKGBUILDDIR/$OS_RELEASE" linux pkg dump -l pkg -r "$TCDIR/$TARGET" "$REPODIR/rootfs.pkg" \ > "$PKGBUILDDIR/files.txt" diff --git a/pkg/release-qemu/build b/pkg/release-qemu/build index 38568ef..6e947eb 100755 --- a/pkg/release-qemu/build +++ b/pkg/release-qemu/build @@ -2,7 +2,7 @@ DEPENDS="rootfs linux" SUBPKG="release" build() { - pkg install -om -r "$PKGBUILDDIR/$OS_RELEASE" -R "$REPODIR" linux + pkg install -om -r "$PKGBUILDDIR/$OS_RELEASE" linux pkg dump -l pkg -r "$TCDIR/$TARGET" "$REPODIR/rootfs.pkg" \ > "$PKGBUILDDIR/files.txt" diff --git a/pkg/release-rpi3/build b/pkg/release-rpi3/build index ad66c91..d3c8277 100755 --- a/pkg/release-rpi3/build +++ b/pkg/release-rpi3/build @@ -2,7 +2,7 @@ DEPENDS="rootfs boot-rpi boot-rpi-dtbo boot-rpi-dtb linux" SUBPKG="release" build() { - pkg install -om -r "$PKGBUILDDIR/boot" -R "$REPODIR" \ + pkg install -om -r "$PKGBUILDDIR/boot" \ boot-rpi boot-rpi-dtbo boot-rpi-dtb linux pkg dump -l pkg -r "$TCDIR/$TARGET" "$REPODIR/rootfs.pkg" \ diff --git a/pkg/rootfs/build b/pkg/rootfs/build index 8618eeb..7ffefd5 100755 --- a/pkg/rootfs/build +++ b/pkg/rootfs/build @@ -5,9 +5,7 @@ build() { local desc="$PKGDEPLOYDIR/$PKGNAME.desc" # generate package description and file listing - pkg install -l pkg -R "$REPODIR" -r "$TCDIR/$TARGET" $DEPENDS |\ - sort -u > "$listing" - + pkg install -l pkg -r "$TCDIR/$TARGET" $DEPENDS | sort -u > "$listing" touch "$desc" # move configuration to preserve directory diff --git a/pkg/tc-pkgtool/build b/pkg/tc-pkgtool/build index 20f4521..5b8b425 100755 --- a/pkg/tc-pkgtool/build +++ b/pkg/tc-pkgtool/build @@ -11,7 +11,9 @@ prepare() { build() { $1/configure --prefix="$TCDIR" --disable-static \ - --build="$HOSTTUPLE" --host="$HOSTTUPLE" + --build="$HOSTTUPLE" --host="$HOSTTUPLE" \ + --with-repo-dir="$REPODIR" \ + --with-install-root="$TCDIR/$TARGET" make -j $NUMJOBS } diff --git a/util/build_package.sh b/util/build_package.sh index e3da7a6..5b6f798 100644 --- a/util/build_package.sh +++ b/util/build_package.sh @@ -22,7 +22,7 @@ build_package() { mkdir -p "$TCDIR/$TARGET" "$PKGBUILDDIR" "$PKGDEPLOYDIR" if [ ! -z "$DEPENDS" ]; then - pkg install -omD -r "$TCDIR/$TARGET" -R "$REPODIR" $DEPENDS + pkg install -omD $DEPENDS fi run_pkg_command "build" @@ -31,7 +31,7 @@ build_package() { strip_files ${PKGDEPLOYDIR}/{bin,lib} for f in $SUBPKG; do - pkg pack -r "$REPODIR" -d "$PKGDEPLOYDIR/${f}.desc" \ + pkg pack -d "$PKGDEPLOYDIR/${f}.desc" \ -l "$PKGDEPLOYDIR/${f}.files" done