Commit bae68980 authored by jan.koester's avatar jan.koester
Browse files

rpm ppc

parent 701e86a4

boards/nas-itx/installer/nas-itx-install.cpp

+1 −1
Changes for boards/nas-itx/installer/nas-itx-install.cpp: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -272,7 +272,7 @@ int main(int argc, char** argv) { 
        printf("installing:\n");

        if (!write_raw(*dtb, d) || !write_raw(*ker, k) || !write_ubi(*fs, r)) return 1;

        printf("done. U-Boot: nand read <addr> 0x%llx 0x%llx (kernel), 0x%llx 0x%llx (dtb)\n",

               0x300000ULL, (unsigned long long)k.size(), 0x200000ULL, (unsigned long long)d.size());

               0x400000ULL, (unsigned long long)k.size(), 0x200000ULL, (unsigned long long)d.size());

        return 0;

    }

    fprintf(stderr, "usage: %s survey | install <uImage> <dtb> <rootfs.ubifs> [--force]\n", argv[0]);

build-cross.sh

+4 −1
Changes for build-cross.sh: 4 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -472,8 +472,11 @@ step_rootfs() { 
        find "$rpmdir" "$WORK/rpmbuild/RPMS/noarch" -name '*.rpm' ! -name '*-dev-*' ! -name '*-devel-*' \

            ! -name '*-debuginfo-*' 2>/dev/null | sort >"$list"

        msg "rootfs: installing $(wc -l <"$list") RPMs"

        : >"$LOGS/rootfs.log"

        run rootfs unshare -r rpm --root "$ROOTFS" --initdb

        if ! unshare -r rpm --root "$ROOTFS" --ignorearch -ivh $(cat "$list") >>"$LOGS/rootfs.log" 2>&1; then

        # QEMU_CPU: binfmt's qemu-$PROC defaults to a CPU without the e500

        # instructions (isel) the binaries use -- scriptlets died with SIGILL

        if ! QEMU_CPU=e500v2 unshare -r rpm --root "$ROOTFS" --ignorearch -ivh $(cat "$list") >>"$LOGS/rootfs.log" 2>&1; then

            grep -E 'is needed by|conflicts with' "$LOGS/rootfs.log" | sort -u | head -40 >&2

            die "rootfs: RPM dependencies unresolved (see above, log: $LOGS/rootfs.log)"

        fi