Added havaged

Bugfixes after restructuring
This commit is contained in:
Nathan Fisher 2021-03-04 09:23:50 -05:00
parent a5d0778d53
commit 94998f6491
8 changed files with 31 additions and 9 deletions

View File

@ -113,22 +113,22 @@ rootfs-txz: rootfs-hhl-$(os_version)-$(arch).txz
.PHONY: rootfs-tgz rootfs-tbz rootfs-txz .PHONY: rootfs-tgz rootfs-tbz rootfs-txz
toolchain-hhl-$(os_version)-$(arch).tgz: $(tooldir)/.built smalltools toolchain-hhl-$(os_version)-$(arch).tgz: $(tooldir)/.built smalltools
paxtar -M uidgid -czf ../$@ toolchain-$(arch) cd $(tooldir) && paxtar -M uidgid -czf $(basedir)/$@ toolchain-$(arch)
toolchain-hhl-$(os_version)-$(arch).tbz: $(tooldir)/.built smalltools toolchain-hhl-$(os_version)-$(arch).tbz: $(tooldir)/.built smalltools
paxtar -M uidgid -cjf ../$@ toolchain-$(arch) cd $(tooldir) && paxtar -M uidgid -cjf $(basedir)/$@ toolchain-$(arch)
toolchain-hhl-$(os_version)-$(arch).txz: $(tooldir)/.built smalltools toolchain-hhl-$(os_version)-$(arch).txz: $(tooldir)/.built smalltools
paxtar -M uidgid -cJf ../$@ toolchain-$(arch) cd $(tooldir) && paxtar -M uidgid -cJf $(basedir)/$@ toolchain-$(arch)
rootfs-hhl-$(os_version)-$(arch).tgz: $(plists) $(build)/.stripped rootfs-hhl-$(os_version)-$(arch).tgz: $(plists) $(build)/.stripped
cd build && paxtar -M uidgid -czf ../$@ $(alldirs) cd $(build) && paxtar -M uidgid -czf $(basedir)/$@ $(alldirs)
rootfs-hhl-$(os_version)-$(arch).tbz: $(plists) $(build)/.stripped rootfs-hhl-$(os_version)-$(arch).tbz: $(plists) $(build)/.stripped
cd build && paxtar -M uidgid -cjf ../$@ $(alldirs) cd $(build) && paxtar -M uidgid -cjf $(basedir)/$@ $(alldirs)
rootfs-hhl-$(os_version)-$(arch).txz: $(plists) $(build)/.stripped rootfs-hhl-$(os_version)-$(arch).txz: $(plists) $(build)/.stripped
cd build && paxtar -M uidgid -cJf ../$@ $(alldirs) cd $(build) && paxtar -M uidgid -cJf $(basedir)/$@ $(alldirs)
remove-toolchain: remove-toolchain:
$(MAKE) -C toolchain remove $(MAKE) -C toolchain remove

View File

@ -94,6 +94,7 @@ tzdata${tzdata_version}.tar.gz \
u-boot-$(u-boot_version).tar.bz2 \ u-boot-$(u-boot_version).tar.bz2 \
udev-lfs-${udev-lfs_version}.tar.xz \ udev-lfs-${udev-lfs_version}.tar.xz \
util-linux-${util-linux_version}.tar.xz \ util-linux-${util-linux_version}.tar.xz \
v1.9.14.tar.gz \
vim-${vim_version}.tar.gz \ vim-${vim_version}.tar.gz \
wget-${wget_version}.tar.gz \ wget-${wget_version}.tar.gz \
wireless-tools/wireless_tools.${wireless_tools_version}.tar.gz \ wireless-tools/wireless_tools.${wireless_tools_version}.tar.gz \
@ -280,6 +281,11 @@ gzip: gzip-${gzip_version}.tar.xz
gzip-${gzip_version}.tar.xz: gzip-${gzip_version}.tar.xz:
wget -c ${gnu}/gzip/$@ wget -c ${gnu}/gzip/$@
haveged: v1.9.14.tar.gz
v1.9.14.tar.gz:
wget -c $(github)/jirka-h/haveged/archive/$@
iana-etc: iana-etc-${iana-etc_version}.tar.gz iana-etc: iana-etc-${iana-etc_version}.tar.gz
iana-etc-${iana-etc_version}.tar.gz: iana-etc-${iana-etc_version}.tar.gz:

View File

@ -39,6 +39,7 @@ grep_version = 3.6
groff_version = 1.22.4 groff_version = 1.22.4
grub_version = 2.04 grub_version = 2.04
gzip_version = 1.10 gzip_version = 1.10
haveged_version = 1.9.14
iana-etc_version = 20210115 iana-etc_version = 20210115
inetutils_version = 1.9.4 inetutils_version = 1.9.4
intltool_version = 0.51.0 intltool_version = 0.51.0

View File

@ -1,6 +1,6 @@
# Makefile - hhl - /usr/src/world/foo # Makefile - hhl - /src/world/foo
# Copyright 2020 Nathan Fisher <nfisher.sr@gmail.com> # Copyright 2020 Nathan Fisher <nfisher.sr@gmail.com>
# #
distname = foo distname = foo
include world.mk include world.mk
include targets.mk include targets.mk

View File

@ -19,4 +19,4 @@ include targets.mk
$(tooldir)/lib64: $(tooldir)/lib64:
install -d $(tooldir)/lib install -d $(tooldir)/lib
ln -s lib $(toolcdir)/lib64 ln -s lib $(tooldir)/lib64

View File

@ -13,6 +13,10 @@ else ifeq ($(arch), riscv64)
export ARCH=riscv export ARCH=riscv
else ifeq ($(arch), risv32) else ifeq ($(arch), risv32)
export ARCH=riscv export ARCH=riscv
else ifeq ($(arch), x86_64)
export ARCH=x86_64
else ifeq ($(filter i486 i586 i686, $(arch)), $(arch))
export ARCH=x86
endif endif
build_cmd = KBUILD_OUTPUT=$(objdir) $(MAKE) -C $(srcdir) headers build_cmd = KBUILD_OUTPUT=$(objdir) $(MAKE) -C $(srcdir) headers
define post_build define post_build

View File

@ -69,6 +69,7 @@ subdirs += texinfo
subdirs += procps-ng subdirs += procps-ng
subdirs += util-linux subdirs += util-linux
subdirs += e2fsprogs subdirs += e2fsprogs
subdirs += haveged
subdirs += eudev subdirs += eudev
subdirs += skalibs subdirs += skalibs
subdirs += execline subdirs += execline

10
world/haveged/Makefile Normal file
View File

@ -0,0 +1,10 @@
# Makefile - hhl - /src/world/havaged
# Copyright 2020 Nathan Fisher <nfisher.sr@gmail.com>
#
distname = haveged
distext = gz
distfile = v$(haveged_version).tar.gz
include world.mk
config_opts += --host=$(tgt)
config_opts += --with-sysroot=$(DESTDIR)
include targets.mk