mirror of
https://github.com/pygos/build.git
synced 2024-11-22 11:09:46 +01:00
cleanup: new pkg tool can be built with default root/repodir
Signed-off-by: David Oberhollenzer <goliath@infraroot.at>
This commit is contained in:
parent
42df0f592a
commit
0ef38e31ee
7 changed files with 11 additions and 11 deletions
|
@ -37,8 +37,8 @@ build() {
|
||||||
local INITRDLIST="$INITRDDIR/initrd.list"
|
local INITRDLIST="$INITRDDIR/initrd.list"
|
||||||
local LINUX_CPU=$(get_linux_cpu)
|
local LINUX_CPU=$(get_linux_cpu)
|
||||||
|
|
||||||
pkg install -omLD -R "$REPODIR" -r "$INITRDDIR" initrd
|
pkg install -omLD -r "$INITRDDIR" initrd
|
||||||
pkg install -R "$REPODIR" -r "$INITRDDIR" -l initrd initrd > "$INITRDLIST"
|
pkg install -r "$INITRDDIR" -l initrd initrd > "$INITRDLIST"
|
||||||
|
|
||||||
export KBUILD_OUTPUT="$PKGBUILDDIR"
|
export KBUILD_OUTPUT="$PKGBUILDDIR"
|
||||||
|
|
||||||
|
|
|
@ -2,7 +2,7 @@ DEPENDS="rootfs linux"
|
||||||
SUBPKG="release"
|
SUBPKG="release"
|
||||||
|
|
||||||
build() {
|
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" \
|
pkg dump -l pkg -r "$TCDIR/$TARGET" "$REPODIR/rootfs.pkg" \
|
||||||
> "$PKGBUILDDIR/files.txt"
|
> "$PKGBUILDDIR/files.txt"
|
||||||
|
|
|
@ -2,7 +2,7 @@ DEPENDS="rootfs linux"
|
||||||
SUBPKG="release"
|
SUBPKG="release"
|
||||||
|
|
||||||
build() {
|
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" \
|
pkg dump -l pkg -r "$TCDIR/$TARGET" "$REPODIR/rootfs.pkg" \
|
||||||
> "$PKGBUILDDIR/files.txt"
|
> "$PKGBUILDDIR/files.txt"
|
||||||
|
|
|
@ -2,7 +2,7 @@ DEPENDS="rootfs boot-rpi boot-rpi-dtbo boot-rpi-dtb linux"
|
||||||
SUBPKG="release"
|
SUBPKG="release"
|
||||||
|
|
||||||
build() {
|
build() {
|
||||||
pkg install -om -r "$PKGBUILDDIR/boot" -R "$REPODIR" \
|
pkg install -om -r "$PKGBUILDDIR/boot" \
|
||||||
boot-rpi boot-rpi-dtbo boot-rpi-dtb linux
|
boot-rpi boot-rpi-dtbo boot-rpi-dtb linux
|
||||||
|
|
||||||
pkg dump -l pkg -r "$TCDIR/$TARGET" "$REPODIR/rootfs.pkg" \
|
pkg dump -l pkg -r "$TCDIR/$TARGET" "$REPODIR/rootfs.pkg" \
|
||||||
|
|
|
@ -5,9 +5,7 @@ build() {
|
||||||
local desc="$PKGDEPLOYDIR/$PKGNAME.desc"
|
local desc="$PKGDEPLOYDIR/$PKGNAME.desc"
|
||||||
|
|
||||||
# generate package description and file listing
|
# generate package description and file listing
|
||||||
pkg install -l pkg -R "$REPODIR" -r "$TCDIR/$TARGET" $DEPENDS |\
|
pkg install -l pkg -r "$TCDIR/$TARGET" $DEPENDS | sort -u > "$listing"
|
||||||
sort -u > "$listing"
|
|
||||||
|
|
||||||
touch "$desc"
|
touch "$desc"
|
||||||
|
|
||||||
# move configuration to preserve directory
|
# move configuration to preserve directory
|
||||||
|
|
|
@ -11,7 +11,9 @@ prepare() {
|
||||||
|
|
||||||
build() {
|
build() {
|
||||||
$1/configure --prefix="$TCDIR" --disable-static \
|
$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
|
make -j $NUMJOBS
|
||||||
}
|
}
|
||||||
|
|
|
@ -22,7 +22,7 @@ build_package() {
|
||||||
mkdir -p "$TCDIR/$TARGET" "$PKGBUILDDIR" "$PKGDEPLOYDIR"
|
mkdir -p "$TCDIR/$TARGET" "$PKGBUILDDIR" "$PKGDEPLOYDIR"
|
||||||
|
|
||||||
if [ ! -z "$DEPENDS" ]; then
|
if [ ! -z "$DEPENDS" ]; then
|
||||||
pkg install -omD -r "$TCDIR/$TARGET" -R "$REPODIR" $DEPENDS
|
pkg install -omD $DEPENDS
|
||||||
fi
|
fi
|
||||||
|
|
||||||
run_pkg_command "build"
|
run_pkg_command "build"
|
||||||
|
@ -31,7 +31,7 @@ build_package() {
|
||||||
strip_files ${PKGDEPLOYDIR}/{bin,lib}
|
strip_files ${PKGDEPLOYDIR}/{bin,lib}
|
||||||
|
|
||||||
for f in $SUBPKG; do
|
for f in $SUBPKG; do
|
||||||
pkg pack -r "$REPODIR" -d "$PKGDEPLOYDIR/${f}.desc" \
|
pkg pack -d "$PKGDEPLOYDIR/${f}.desc" \
|
||||||
-l "$PKGDEPLOYDIR/${f}.files"
|
-l "$PKGDEPLOYDIR/${f}.files"
|
||||||
done
|
done
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue