Skip to content

[WIP] feat: add net/ethernet/realtek driver r8169 #33

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
zexi wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[WIP] feat: add net/ethernet/realtek driver r8169 #33

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ docker-make-rpm:
registry.cn-beijing.aliyuncs.com/yunionio/centos-build:1.1-4 \
/bin/bash -c "make -C /data make-rpm"

YUNIONOS_VERSION = "v0.1.9-20231129.0"
YUNIONOS_VERSION ?= "v0.1.9-20231205.0"

docker-yunionos-image:
docker buildx build --platform linux/arm64,linux/amd64 --push \
Expand Down
20 changes: 18 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,11 @@ $ make docker-buildroot
$ make docker-buildroot-arm64

# 查看制作好的镜像
$ ls ./output/rootfs.tar
# x86_64
$ ls ./output/images/rootfs.tar

# arm64
$ ls ./output_arm64/images
```

### 配置 buildroot config
Expand Down Expand Up @@ -71,15 +75,27 @@ kernel-ml-5.12.9-1.el7.elrepo.x86_64.rpm
然后执行下面的命令进行 bundle：

```bash
# bundle x86_64
$ make docker-bundle
# bundle arm64
$ make docker-bundle-arm64

# 或者执行 docker-bundle-all
$ make docker-bundle-all

# 生成的文件会在 ./output_bundle
# 生成的文件会在 ./output_bundle 和 ./output_bundle_arm64
$ ls output_bundle
baremetal_prepare bootx64.efi intermediate ldlinux.c32 libcom32.c32 menu.c32
baremetal_prepare.tar.gz chain.c32 isolinux.bin ldlinux.e32 libutil.c32 pxelinux.0
bootia32.efi initramfs kernel ldlinux.e64 lpxelinux.0
```

### 将 bundle 文件做成 yunionos docker image

```bash
$ YUNIONOS_VERSION=test-version-20231205.2 make docker-yunionos-image
```

### 将 bundle 的文件做成 RPM

```bash
Expand Down
1 change: 1 addition & 0 deletions src/etc/modules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ ice
tg3
bnx2
bnx2x
r8169
virtio_net
virtio_scsi
virtio_pci
Expand Down